[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Kurt Roeckx]

The branch OpenSSL_1_0_1-stable has been updated
       via  184693f4af2846dd89f473482e55df26c428da36 (commit)
      from  925bfca5d347d10f1a2e172be001090ae7ebafc2 (commit)


- Log -----------------------------------------------------------------
commit 184693f4af2846dd89f473482e55df26c428da36
Author: Kurt Roeckx <kurt at roeckx.be>
Date:   Sat Jan 24 15:04:53 2015 +0100

    Fix segfault with empty fields as last in the config.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/asn1_gen.c  |    3 +++
 crypto/engine/eng_fat.c |    2 ++
 2 files changed, 5 insertions(+)

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 132a9ef..aaec009 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -279,6 +279,9 @@ static int asn1_cb(const char *elem, int len, void *bitstr)
 
     int tmp_tag, tmp_class;
 
+    if (elem == NULL)
+        return 0;
+
     for (i = 0, p = elem; i < len; p++, i++) {
         /* Look for the ':' in name value pairs */
         if (*p == ':') {
diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index bcb4c44..4279dd9 100644
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -103,6 +103,8 @@ int ENGINE_set_default(ENGINE *e, unsigned int flags)
 static int int_def_cb(const char *alg, int len, void *arg)
 {
     unsigned int *pflags = arg;
+    if (alg == NULL)
+        return 0;
     if (!strncmp(alg, "ALL", len))
         *pflags |= ENGINE_METHOD_ALL;
     else if (!strncmp(alg, "RSA", len))