[Dcplusplus-commit] dcplusplus/yassl/include cert_wrapper.hpp,1.1,1.2 yassl_int.hpp,1.1,1.2 yassl_types.hpp,1.1,1.2

[Jacek S. <arn...@us...>]

Update of /cvsroot/dcplusplus/dcplusplus/yassl/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25210/yassl/include

Modified Files:
	cert_wrapper.hpp yassl_int.hpp yassl_types.hpp 
Log Message:
yassl update, installer fix

Index: cert_wrapper.hpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/include/cert_wrapper.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** cert_wrapper.hpp	27 Nov 2005 19:19:19 -0000	1.1
--- cert_wrapper.hpp	19 Feb 2006 16:51:09 -0000	1.2
***************
*** 84,87 ****
--- 84,88 ----
                                          //    plus verified chained certs
      bool verifyPeer_;
+     bool verifyNone_;                   // no error if verify fails
      bool failNoCert_;
      bool sendVerify_;
***************
*** 108,115 ****
--- 109,118 ----
  
      bool verifyPeer() const;
+     bool verifyNone() const;
      bool failNoCert() const;
      bool sendVerify() const;
  
      void setVerifyPeer();
+     void setVerifyNone();
      void setFailNoCert();
      void setSendVerify();

Index: yassl_types.hpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/include/yassl_types.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** yassl_types.hpp	27 Nov 2005 19:19:19 -0000	1.1
--- yassl_types.hpp	19 Feb 2006 16:51:09 -0000	1.2
***************
*** 35,80 ****
  namespace yaSSL {
  
! // library allocation
! struct new_t {};      // yaSSL New type
! extern new_t ys;      // pass in parameter
  
! } // namespace yaSSL
  
! void* operator new  (size_t, yaSSL::new_t);
! void* operator new[](size_t, yaSSL::new_t);
  
! void operator delete  (void*, yaSSL::new_t);
! void operator delete[](void*, yaSSL::new_t);
  
  
- namespace yaSSL {
  
  
- template<typename T>
- void ysDelete(T* ptr)
- {
-     if (ptr) ptr->~T();
-     ::operator delete(ptr, yaSSL::ys);
- }
  
! template<typename T>
! void ysArrayDelete(T* ptr)
! {
!     // can't do array placement destruction since not tracking size in
!     // allocation, only allow builtins to use array placement since they
!     // don't need destructors called
!     typedef char builtin[TaoCrypt::IsFundamentalType<T>::Yes ? 1 : -1];
!     (void)sizeof(builtin);
  
!     ::operator delete[](ptr, yaSSL::ys);
! }
  
  
! // to resolve compiler generated operator delete on base classes with
! // virtual destructors (when on stack), make sure doesn't get called
! class virtual_base {
! public:
!     static void operator delete(void*) { assert(0); }
! };
  
  
--- 35,107 ----
  namespace yaSSL {
  
! #ifdef YASSL_PURE_C
  
!     // library allocation
!     struct new_t {};      // yaSSL New type
!     extern new_t ys;      // pass in parameter
  
!     } // namespace yaSSL
  
!     void* operator new  (size_t, yaSSL::new_t);
!     void* operator new[](size_t, yaSSL::new_t);
  
+     void operator delete  (void*, yaSSL::new_t);
+     void operator delete[](void*, yaSSL::new_t);
  
  
+     namespace yaSSL {
  
  
!     template<typename T>
!     void ysDelete(T* ptr)
!     {
!         if (ptr) ptr->~T();
!         ::operator delete(ptr, yaSSL::ys);
!     }
  
!     template<typename T>
!     void ysArrayDelete(T* ptr)
!     {
!         // can't do array placement destruction since not tracking size in
!         // allocation, only allow builtins to use array placement since they
!         // don't need destructors called
!         typedef char builtin[TaoCrypt::IsFundamentalType<T>::Yes ? 1 : -1];
!         (void)sizeof(builtin);
  
+         ::operator delete[](ptr, yaSSL::ys);
+     }
  
!     #define NEW_YS new (ys) 
! 
!     // to resolve compiler generated operator delete on base classes with
!     // virtual destructors (when on stack), make sure doesn't get called
!     class virtual_base {
!     public:
!         static void operator delete(void*) { assert(0); }
!     };
! 
! 
! #else   // YASSL_PURE_C
! 
! 
!     template<typename T>
!     void ysDelete(T* ptr)
!     {
!         delete ptr;
!     }
! 
!     template<typename T>
!     void ysArrayDelete(T* ptr)
!     {
!         delete[] ptr;
!     }
! 
!     #define NEW_YS new
! 
!     class virtual_base {};
! 
! 
! 
! #endif // YASSL_PURE_C
  
  

Index: yassl_int.hpp
===================================================================
RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/include/yassl_int.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** yassl_int.hpp	27 Nov 2005 19:19:19 -0000	1.1
--- yassl_int.hpp	19 Feb 2006 16:51:09 -0000	1.2
***************
*** 230,234 ****
      ProtocolVersion version_;
      ConnectionEnd   side_;
!     bool            verifyPeer_;
      bool            failNoCert_;
  public:
--- 230,235 ----
      ProtocolVersion version_;
      ConnectionEnd   side_;
!     bool            verifyPeer_;    // request or send certificate
!     bool            verifyNone_;    // whether to verify certificate
      bool            failNoCert_;
  public:
***************
*** 239,245 ****
--- 240,248 ----
  
      void setVerifyPeer();
+     void setVerifyNone();
      void setFailNoCert();
  
      bool verifyPeer() const;
+     bool verifyNone() const;
      bool failNoCert() const;
  private:
***************
*** 334,337 ****
--- 337,341 ----
  
      void setVerifyPeer();
+     void setVerifyNone();
      void setFailNoCert();
      bool SetCipherList(const char*);