OpenSSL 0.9.5a merge

3 files changed, 18 insertions, 4 deletions

diff --git a/src/lib/libcrypto/evp/evp_err.c b/src/lib/libcrypto/evp/evp_err.c
index 97953a0fc1..fc149cbb1a 100644
--- a/src/lib/libcrypto/evp/evp_err.c
+++ b/src/lib/libcrypto/evp/evp_err.c
@@ -54,7 +54,8 @@
  */
 
 /* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file.
+ * made to it will be overwritten when the script next updates this file,
+ * only reason strings will be preserved.
  */
 
 #include <stdio.h>
diff --git a/src/lib/libcrypto/evp/evp_pkey.c b/src/lib/libcrypto/evp/evp_pkey.c
index d5e6f5880f..4ab091fa56 100644
--- a/src/lib/libcrypto/evp/evp_pkey.c
+++ b/src/lib/libcrypto/evp/evp_pkey.c
@@ -133,7 +133,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
                      * SEQUENCE {parameters, priv_key}
                      * SEQUENCE {pub_key, priv_key}
                      */
-                     
+
                     t1 = (ASN1_TYPE *)sk_value(ndsa, 0);
                     t2 = (ASN1_TYPE *)sk_value(ndsa, 1);
                     if(t1->type == V_ASN1_SEQUENCE) {
@@ -152,7 +152,14 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
                         goto dsaerr;
                     }
                     privkey = t2->value.integer;
-                } else if (!(privkey=d2i_ASN1_INTEGER (NULL, &p, pkeylen))) {
+                } else {
+                        if (!(privkey=d2i_ASN1_INTEGER (NULL, &p, pkeylen))) {
+                                EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
+                                goto dsaerr;
+                        }
+                        param = p8->pkeyalg->parameter;
+                }
+                if (!param || (param->type != V_ASN1_SEQUENCE)) {
                         EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
                         goto dsaerr;
                 }
@@ -186,7 +193,8 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
 
                 EVP_PKEY_assign_DSA(pkey, dsa);
                 BN_CTX_free (ctx);
-                sk_pop_free(ndsa, ASN1_TYPE_free);
+                if(ndsa) sk_pop_free(ndsa, ASN1_TYPE_free);
+                else ASN1_INTEGER_free(privkey);
                 break;
                 dsaerr:
                 BN_CTX_free (ctx);
diff --git a/src/lib/libcrypto/evp/names.c b/src/lib/libcrypto/evp/names.c
index 3e8f460328..620f43feaa 100644
--- a/src/lib/libcrypto/evp/names.c
+++ b/src/lib/libcrypto/evp/names.c
@@ -114,5 +114,10 @@ void EVP_cleanup(void)
         {
         OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH);
         OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH);
+        /* The above calls will only clean out the contents of the name
+           hash table, but not the hash table itself.  The following line
+           does that part.  -- Richard Levitte */
+        OBJ_NAME_cleanup(-1);
+
         EVP_PBE_cleanup();
         }