[Epp-rtk-cpp-commits] CVS: epp-rtk/c++/src/ssl Makefile.am,1.2,1.2.2.1 npssl.cc,1.1,1.1.2.1 npssl.h,1.1,1.1.2.1

[Daniel M. <tub...@us...>]

Update of /cvsroot/epp-rtk/epp-rtk/c++/src/ssl
In directory sc8-pr-cvs1:/tmp/cvs-serv5162/src/ssl

Modified Files:
      Tag: epp-pre02
	Makefile.am npssl.cc npssl.h 
Log Message:
bringing the old .info C++ rtk update to gcc 3.x standard for C++
and backporting the improved automake/autoconf from the 0.7.x
release of the C++ RTK


Index: Makefile.am
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ssl/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** Makefile.am	28 Jun 2001 14:02:55 -0000	1.2
--- Makefile.am	12 Dec 2003 23:24:29 -0000	1.2.2.1
***************
*** 1,16 ****
! noinst_LIBRARIES = libnpssl.a
! 
  CLEANFILES = *~
  DISTCLEANFILES = Makefile.in
- 
- 
- libnpssl_a_SOURCES = \
- 	npssl.h \
- 	npssl.cc
- 
- 
- #LDADD =  libnpssl.a  -L/usr/local/xerces/lib/ -lxerces-c1_4  -L/usr/local/ssl/lib -lssl -lcrypt -lcrypto
- #LDADD = -L /usr/local/lib/npbase -lnpbase -lnpssl -lcrypt -lssl -lcrypto
- 
- LDFLAGS = 
- INCLUDES =-I/usr/local/ssl/include -I/usr/local
--- 1,16 ----
! lib_LIBRARIES = libnpssl.a
!  
! exportedheaders = \
!         npssl.h
!  
! pkgincludedir = $(includedir)/$(PACKAGE)/ssl
! pkginclude_HEADERS = $(exportedheaders)
!  
! libnpssl_a_SOURCES = \
!         $(exportedheaders) \
!         npssl.cc
!  
! INCLUDES =-I/usr/local/ssl/include -I/usr/local/openssl/include
!  
  CLEANFILES = *~
  DISTCLEANFILES = Makefile.in

Index: npssl.cc
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ssl/npssl.cc,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** npssl.cc	19 Jun 2001 19:16:38 -0000	1.1
--- npssl.cc	12 Dec 2003 23:24:29 -0000	1.1.2.1
***************
*** 29,32 ****
--- 29,33 ----
  #include <unistd.h>
  
+ using namespace std;
  using namespace npbase;
  

Index: npssl.h
===================================================================
RCS file: /cvsroot/epp-rtk/epp-rtk/c++/src/ssl/npssl.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** npssl.h	19 Jun 2001 19:16:38 -0000	1.1
--- npssl.h	12 Dec 2003 23:24:29 -0000	1.1.2.1
***************
*** 47,53 ****
      bool server;
  
!     string int_inbuffer;
!     string int_outbuffer;
!     string readbuffer;
      
      void ssl_error(void);
--- 47,53 ----
      bool server;
  
!     std::string int_inbuffer;
!     std::string int_outbuffer;
!     std::string readbuffer;
      
      void ssl_error(void);
***************
*** 56,60 ****
  
  
!     void setVerifyLocations(const string &certname, const string &pathname);
      void setClientVerification(int mode,int (*verify_callback)(int, X509_STORE_CTX *));
      void setClientVerificationDepth(int depth);
--- 56,60 ----
  
  
!     void setVerifyLocations(const std::string &certname, const std::string &pathname);
      void setClientVerification(int mode,int (*verify_callback)(int, X509_STORE_CTX *));
      void setClientVerificationDepth(int depth);
***************
*** 64,68 ****
      long getVerifyResult( void );
  
!     void setCertFile(const string &filename);
      bool handShake(int infd, int outfd);
  
--- 64,68 ----
      long getVerifyResult( void );
  
!     void setCertFile(const std::string &filename);
      bool handShake(int infd, int outfd);
  
***************
*** 71,77 ****
  
      // get functions
!     string getS(void);
      char getch(void);
!     string bufferedGetS(void);
      char bufferedGetch(void);
      void bufferedUnGetch(char c);
--- 71,77 ----
  
      // get functions
!     std::string getS(void);
      char getch(void);
!     std::string bufferedGetS(void);
      char bufferedGetch(void);
      void bufferedUnGetch(char c);
***************
*** 80,86 ****
  
      // put functions
!     bool putS(const string &str);
      bool putch(char c);
!     bool bufferedPutS(const string &str);
      bool bufferedPutch(char c);
  
--- 80,86 ----
  
      // put functions
!     bool putS(const std::string &str);
      bool putch(char c);
!     bool bufferedPutS(const std::string &str);
      bool bufferedPutch(char c);