bk commit into 5.0 tree (msvensson:1.2460)

[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@stripped, 2007-05-09 00:27:04+02:00, msvensson@stripped +2 -0
  Import latest cyassl

  extra/cyassl/include/openssl/ssl.h@stripped, 2007-05-08 18:20:24+02:00, msvensson@stripped +6 -0
    Import patch yassl.diff

  extra/cyassl/src/ssl.c@stripped, 2007-05-08 18:20:24+02:00, msvensson@stripped +28 -0
    Import patch yassl.diff

# 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:	pilot.blaudden
# Root:	/home/msvensson/mysql/cyassl/my50-cyassl

--- 1.2/extra/cyassl/include/openssl/ssl.h	2007-05-08 10:44:44 +02:00
+++ 1.3/extra/cyassl/include/openssl/ssl.h	2007-05-08 18:20:24 +02:00
@@ -181,6 +181,12 @@ long SSL_CTX_set_mode(SSL_CTX* ctx, long
 long SSL_CTX_get_mode(SSL_CTX* ctx);
 void SSL_CTX_set_default_read_ahead(SSL_CTX* ctx, int m);
 
+long SSL_CTX_sess_set_cache_size(SSL_CTX*, long);
+long SSL_CTX_sess_get_cache_size(SSL_CTX*);
+
+int  SSL_CTX_set_default_verify_paths(SSL_CTX*);
+int  SSL_CTX_set_session_id_context(SSL_CTX*, const unsigned char*,
+                                    unsigned int);
 /* extra ends */
 
 

--- 1.3/extra/cyassl/src/ssl.c	2007-05-08 11:06:22 +02:00
+++ 1.4/extra/cyassl/src/ssl.c	2007-05-08 18:20:24 +02:00
@@ -1059,6 +1059,34 @@ int CyaSSL_check_domain_name(SSL* ssl, c
     }
 
 
+    int SSL_CTX_set_default_verify_paths(SSL_CTX* ctx)
+    {
+        /* TODO: */
+        return SSL_NOT_IMPLEMENTED;
+    }
+
+
+    int SSL_CTX_set_session_id_context(SSL_CTX*, const unsigned char*,
+                                       unsigned int)
+    {
+        /* No application specific context needed for cyaSSL */
+        return SSL_SUCCESS;
+    }
+
+
+    long SSL_CTX_sess_set_cache_size(SSL_CTX* ctx, long sz)
+    {
+        /* TODO: maybe? */
+        return 0;
+    }
+
+
+    long SSL_CTX_sess_get_cache_size(SSL_CTX* ctx)
+    {
+        /* TODO: maybe? */
+        return (~0);
+    }
+
     unsigned long ERR_get_error_line_data(const char** file, int* line,
                                           const char** data, int *flags)
     {