bk commit into 5.0 tree (msvensson:1.2110)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2110 06/05/03 13:24:06 msvensson@neptunus.(none) +6 -0
  Merge 192.168.0.20:mysql/my50-maint-yassl
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint

  extra/yassl/taocrypt/include/asn.hpp
    1.6 06/05/03 13:24:02 msvensson@neptunus.(none) +0 -13
    Manual merge

  extra/yassl/testsuite/test.hpp
    1.3 06/05/03 13:23:12 msvensson@neptunus.(none) +0 -2
    Auto merged

  extra/yassl/taocrypt/src/make.bat
    1.3 06/05/03 13:23:12 msvensson@neptunus.(none) +0 -1
    Auto merged

  extra/yassl/taocrypt/src/asn.cpp
    1.7 06/05/03 13:23:11 msvensson@neptunus.(none) +0 -52
    Auto merged

  extra/yassl/src/template_instnt.cpp
    1.8 06/05/03 13:23:11 msvensson@neptunus.(none) +0 -0
    Auto merged

  extra/yassl/mySTL/helpers.hpp
    1.11 06/05/03 13:23:11 msvensson@neptunus.(none) +0 -5
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint/RESYNC

--- 1.7/extra/yassl/src/template_instnt.cpp	2006-04-28 08:33:36 +02:00
+++ 1.8/extra/yassl/src/template_instnt.cpp	2006-05-03 13:23:11 +02:00
@@ -50,12 +50,16 @@
 template class list<yaSSL::input_buffer*>;
 template class list<yaSSL::output_buffer*>;
 template class list<yaSSL::x509*>;
+template class list<yaSSL::Digest*>;
+template class list<yaSSL::BulkCipher*>;
 template void destroy<mySTL::pair<int, yaSSL::ClientKeyBase*
(*)()>*>(mySTL::pair<int, yaSSL::ClientKeyBase* (*)()>*, mySTL::pair<int,
yaSSL::ClientKeyBase* (*)()>*);
 template yaSSL::del_ptr_zero for_each<mySTL::list<TaoCrypt::Signer*>::iterator,
yaSSL::del_ptr_zero>(mySTL::list<TaoCrypt::Signer*>::iterator,
mySTL::list<TaoCrypt::Signer*>::iterator, yaSSL::del_ptr_zero);
 template yaSSL::del_ptr_zero
for_each<mySTL::list<yaSSL::SSL_SESSION*>::iterator,
yaSSL::del_ptr_zero>(mySTL::list<yaSSL::SSL_SESSION*>::iterator,
mySTL::list<yaSSL::SSL_SESSION*>::iterator, yaSSL::del_ptr_zero);
 template yaSSL::del_ptr_zero
for_each<mySTL::list<yaSSL::input_buffer*>::iterator,
yaSSL::del_ptr_zero>(mySTL::list<yaSSL::input_buffer*>::iterator,
mySTL::list<yaSSL::input_buffer*>::iterator, yaSSL::del_ptr_zero);
 template yaSSL::del_ptr_zero
for_each<mySTL::list<yaSSL::output_buffer*>::iterator,
yaSSL::del_ptr_zero>(mySTL::list<yaSSL::output_buffer*>::iterator,
mySTL::list<yaSSL::output_buffer*>::iterator, yaSSL::del_ptr_zero);
 template yaSSL::del_ptr_zero for_each<mySTL::list<yaSSL::x509*>::iterator,
yaSSL::del_ptr_zero>(mySTL::list<yaSSL::x509*>::iterator,
mySTL::list<yaSSL::x509*>::iterator, yaSSL::del_ptr_zero);
+template yaSSL::del_ptr_zero for_each<mySTL::list<yaSSL::Digest*>::iterator,
yaSSL::del_ptr_zero>(mySTL::list<yaSSL::Digest*>::iterator,
mySTL::list<yaSSL::Digest*>::iterator, yaSSL::del_ptr_zero);
+template yaSSL::del_ptr_zero for_each<mySTL::list<yaSSL::BulkCipher*>::iterator,
yaSSL::del_ptr_zero>(mySTL::list<yaSSL::BulkCipher*>::iterator,
mySTL::list<yaSSL::BulkCipher*>::iterator, yaSSL::del_ptr_zero);
 }
 
 namespace yaSSL {
@@ -81,6 +85,7 @@
 template void ysDelete<Message>(Message*);
 template void ysDelete<sslFactory>(sslFactory*);
 template void ysDelete<Sessions>(Sessions*);
+template void ysDelete<CryptProvider>(CryptProvider*);
 template void ysArrayDelete<unsigned char>(unsigned char*);
 template void ysArrayDelete<char>(char*);
 }

--- 1.5/extra/yassl/taocrypt/include/asn.hpp	2006-04-24 23:55:04 +02:00
+++ 1.6/extra/yassl/taocrypt/include/asn.hpp	2006-05-03 13:24:02 +02:00
@@ -92,7 +92,7 @@
 enum Constants
 {
     MIN_DATE_SZ   = 13,
-    MAX_DATE_SZ   = 15,
+    MAX_DATE_SZ   = 16,
     MAX_ALGO_SZ   = 16,
     MAX_LENGTH_SZ =  5,    
     MAX_SEQ_SZ    =  5,    // enum(seq|con) + length(4)
@@ -252,6 +252,8 @@
     const char*      GetIssuer()     const { return issuer_; }
     const char*      GetCommonName() const { return subject_; }
     const byte*      GetHash()       const { return subjectHash_; }
+    const char*      GetBeforeDate() const { return beforeDate_; }
+    const char*      GetAfterDate()  const { return afterDate_; }
 
     void DecodeToKey();
 private:
@@ -266,6 +268,8 @@
     byte*     signature_;
     char      issuer_[NAME_MAX];        // Names
     char      subject_[NAME_MAX];       // Names
+    char      beforeDate_[MAX_DATE_SZ]; // valid before date
+    char      afterDate_[MAX_DATE_SZ];  // valid after date
     bool      verify_;                  // Default to yes, but could be off
 
     void   ReadHeader();

--- 1.6/extra/yassl/taocrypt/src/asn.cpp	2006-04-24 23:55:04 +02:00
+++ 1.7/extra/yassl/taocrypt/src/asn.cpp	2006-05-03 13:23:11 +02:00
@@ -784,6 +784,16 @@
             source_.SetError(BEFORE_DATE_E);
         else
             source_.SetError(AFTER_DATE_E);
+
+    // save for later use
+    if (dt == BEFORE) {
+        memcpy(beforeDate_, date, length);
+        beforeDate_[length] = 0;
+    }
+    else {  // after
+        memcpy(afterDate_, date, length);
+        afterDate_[length] = 0;
+    }       
 }