Merge 192.168.0.10:mysql/yassL-import/my51-yassL-import

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.1-new-maint


vio/viosslfactories.c:
  Auto merged
extra/yassl/taocrypt/src/asn.cpp:
  Manual merge of yaSSL import and "fix warnings"

1 files changed, 13 insertions, 1 deletions

diff --git a/extra/yassl/taocrypt/src/asn.cpp b/extra/yassl/taocrypt/src/asn.cpp
index 5b836135905..5d1711eebe0 100644
--- a/extra/yassl/taocrypt/src/asn.cpp
+++ b/extra/yassl/taocrypt/src/asn.cpp
@@ -732,9 +732,21 @@ void CertDecoder::GetName(NameType nt)
             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);
         }
     }