5 files changed, 12 insertions, 7 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_err.c b/src/lib/libcrypto/asn1/asn1_err.c
index b183814242..cecd555c88 100644
--- a/src/lib/libcrypto/asn1/asn1_err.c
+++ b/src/lib/libcrypto/asn1/asn1_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/asn1/p5_pbe.c b/src/lib/libcrypto/asn1/p5_pbe.c
index 64e90237cc..a147ac3295 100644
--- a/src/lib/libcrypto/asn1/p5_pbe.c
+++ b/src/lib/libcrypto/asn1/p5_pbe.c
@@ -129,7 +129,7 @@ X509_ALGOR *PKCS5_pbe_set(int alg, int iter, unsigned char *salt,
         }
         pbe->salt->length = saltlen;
         if (salt) memcpy (pbe->salt->data, salt, saltlen);
-        else if (RAND_bytes (pbe->salt->data, saltlen) <= 0)
+        else if (RAND_pseudo_bytes (pbe->salt->data, saltlen) < 0)
                 return NULL;
 
         if (!(astype = ASN1_TYPE_new())) {
diff --git a/src/lib/libcrypto/asn1/p5_pbev2.c b/src/lib/libcrypto/asn1/p5_pbev2.c
index 4ce06a94ab..1bbdb10c71 100644
--- a/src/lib/libcrypto/asn1/p5_pbev2.c
+++ b/src/lib/libcrypto/asn1/p5_pbev2.c
@@ -194,7 +194,8 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
         if(!(scheme->parameter = ASN1_TYPE_new())) goto merr;
 
         /* Create random IV */
-        RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher));
+        if (RAND_pseudo_bytes(iv, EVP_CIPHER_iv_length(cipher)) < 0)
+                goto err;
 
         /* Dummy cipherinit to just setup the IV */
         EVP_CipherInit(&ctx, cipher, NULL, iv, 0);
@@ -212,7 +213,7 @@ X509_ALGOR *PKCS5_pbe2_set(const EVP_CIPHER *cipher, int iter,
         if (!(osalt->data = Malloc (saltlen))) goto merr;
         osalt->length = saltlen;
         if (salt) memcpy (osalt->data, salt, saltlen);
-        else if (RAND_bytes (osalt->data, saltlen) <= 0) goto merr;
+        else if (RAND_pseudo_bytes (osalt->data, saltlen) < 0) goto merr;
 
         if(iter <= 0) iter = PKCS5_DEFAULT_ITER;
         if(!ASN1_INTEGER_set(kdf->iter, iter)) goto merr;
diff --git a/src/lib/libcrypto/asn1/t_req.c b/src/lib/libcrypto/asn1/t_req.c
index 81dd6355a8..ea1af092db 100644
--- a/src/lib/libcrypto/asn1/t_req.c
+++ b/src/lib/libcrypto/asn1/t_req.c
@@ -119,7 +119,7 @@ int X509_REQ_print(BIO *bp, X509_REQ *x)
 
         pkey=X509_REQ_get_pubkey(x);
 #ifndef NO_RSA
-        if (pkey->type == EVP_PKEY_RSA)
+        if (pkey != NULL && pkey->type == EVP_PKEY_RSA)
                 {
                 BIO_printf(bp,"%12sRSA Public Key: (%d bit)\n","",
                         BN_num_bits(pkey->pkey.rsa->n));
@@ -128,7 +128,7 @@ int X509_REQ_print(BIO *bp, X509_REQ *x)
         else 
 #endif
 #ifndef NO_DSA
-                if (pkey->type == EVP_PKEY_DSA)
+                if (pkey != NULL && pkey->type == EVP_PKEY_DSA)
                 {
                 BIO_printf(bp,"%12sDSA Public Key:\n","");
                 DSA_print(bp,pkey->pkey.dsa,16);
@@ -137,7 +137,8 @@ int X509_REQ_print(BIO *bp, X509_REQ *x)
 #endif
                 BIO_printf(bp,"%12sUnknown Public Key:\n","");
 
-        EVP_PKEY_free(pkey);
+        if (pkey != NULL)
+            EVP_PKEY_free(pkey);
 
         /* may not be */
         sprintf(str,"%8sAttributes:\n","");
diff --git a/src/lib/libcrypto/asn1/x_pubkey.c b/src/lib/libcrypto/asn1/x_pubkey.c
index 81e9815222..7a05d575c9 100644
--- a/src/lib/libcrypto/asn1/x_pubkey.c
+++ b/src/lib/libcrypto/asn1/x_pubkey.c
@@ -183,8 +183,10 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
 
         Free(s);
 
+#if 0
         CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
         pk->pkey=pkey;
+#endif
 
         if (*x != NULL)
                 X509_PUBKEY_free(*x);