bk commit into 5.1 tree (msvensson:1.2427)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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-02-06 20:23:28+01:00, msvensson@stripped +2 -0
  Merge 192.168.0.10:mysql/yassL-import/my51-yassL-import
  into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.2419.1.1

  extra/yassl/taocrypt/src/asn.cpp@stripped, 2007-02-06 20:23:26+01:00, msvensson@stripped +1 -1
    Manual merge of yaSSL import and "fix warnings"
    MERGE: 1.11.1.3

  vio/viosslfactories.c@stripped, 2007-02-06 20:20:18+01:00, msvensson@stripped +0 -0
    Auto merged
    MERGE: 1.34.1.1

# 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.mysql.com
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.13/extra/yassl/taocrypt/src/asn.cpp	2007-02-06 15:12:10 +01:00
+++ 1.14/extra/yassl/taocrypt/src/asn.cpp	2007-02-06 20:23:26 +01:00
@@ -732,9 +732,21 @@
             source_.advance(strLen);
         }
         else {
-            // skip
+            bool email = false;
+            if (joint[0] == 0x2a && joint[1] == 0x86)  // email id hdr
+                email = true;
+
             source_.advance(oidSz + 1);
             word32 length2 = GetLength(source_);
+
+            if (email) {
+                memcpy(&ptr[idx], "/emailAddress=", 14);
+                idx += 14;
+
+                memcpy(&ptr[idx], source_.get_current(), length);
+                idx += length;
+            }
+
             source_.advance(length2);
         }
     }

--- 1.35/vio/viosslfactories.c	2007-02-01 19:17:00 +01:00
+++ 1.36/vio/viosslfactories.c	2007-02-06 20:20:18 +01:00
@@ -84,10 +84,10 @@
   {
     if (SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0)
     {
-      DBUG_PRINT("error",("unable to get certificate from '%s'\n", cert_file));
-      fprintf(stderr,"SSL error: ");
-      ERR_print_errors_fp(stderr);
-      fprintf(stderr,"Unable to get certificate from '%s'\n", cert_file);
+      DBUG_PRINT("error",("unable to get certificate from '%s'", cert_file));
+      DBUG_EXECUTE("error", ERR_print_errors_fp(DBUG_FILE););
+      fprintf(stderr, "SSL error: Unable to get certificate from '%s'\n",
+              cert_file);
       fflush(stderr);
       DBUG_RETURN(1);
     }
@@ -97,10 +97,10 @@
 
     if (SSL_CTX_use_PrivateKey_file(ctx, key_file, SSL_FILETYPE_PEM) <= 0)
     {
-      DBUG_PRINT("error", ("unable to get private key from '%s'\n", key_file));
-      fprintf(stderr,"SSL error: ");
-      ERR_print_errors_fp(stderr);
-      fprintf(stderr,"Unable to get private key from '%s'\n", key_file);
+      DBUG_PRINT("error", ("unable to get private key from '%s'", key_file));
+      DBUG_EXECUTE("error", ERR_print_errors_fp(DBUG_FILE););
+      fprintf(stderr, "SSL error: Unable to get private key from '%s'\n",
+              key_file);
       fflush(stderr);
       DBUG_RETURN(1);
     }
@@ -112,7 +112,12 @@
     if (!SSL_CTX_check_private_key(ctx))
     {
       DBUG_PRINT("error",
-		 ("Private key does not match the certificate public key\n"));
+		 ("Private key does not match the certificate public key"));
+      DBUG_EXECUTE("error", ERR_print_errors_fp(DBUG_FILE););
+      fprintf(stderr,
+              "SSL error: "
+              "Private key does not match the certificate public key\n");
+      fflush(stderr);
       DBUG_RETURN(1);
     }
   }