OpenSSL 0.9.5a merge

3 files changed, 3 insertions, 6 deletions

diff --git a/src/lib/libcrypto/pkcs7/README b/src/lib/libcrypto/pkcs7/README
index 27001c6970..e69de29bb2 100644
--- a/src/lib/libcrypto/pkcs7/README
+++ b/src/lib/libcrypto/pkcs7/README
@@ -1,5 +0,0 @@
-WARNING
-
-Everything in this directory is experimental and is subject to change.
-
-Do not rely on the stuff in here not changing in the next release
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index 80ac5e34b4..4ab24a86f5 100644
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ b/src/lib/libcrypto/pkcs7/pk7_doit.c
@@ -699,6 +699,7 @@ int PKCS7_dataVerify(X509_STORE *cert_store, X509_STORE_CTX *ctx, BIO *bio,
         if (i <= 0) 
                 {
                 PKCS7err(PKCS7_F_PKCS7_DATAVERIFY,ERR_R_X509_LIB);
+                X509_STORE_CTX_cleanup(ctx);
                 goto err;
                 }
         X509_STORE_CTX_cleanup(ctx);
diff --git a/src/lib/libcrypto/pkcs7/pkcs7err.c b/src/lib/libcrypto/pkcs7/pkcs7err.c
index 813a8af9ed..8ded8913db 100644
--- a/src/lib/libcrypto/pkcs7/pkcs7err.c
+++ b/src/lib/libcrypto/pkcs7/pkcs7err.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>