2 files changed, 22 insertions, 4 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c
index 179b7da90a..f835be8afc 100644
--- a/src/lib/libcrypto/rsa/rsa_eay.c
+++ b/src/lib/libcrypto/rsa/rsa_eay.c
@@ -184,6 +184,9 @@ static int RSA_eay_private_encrypt(int flen, unsigned char *from,
         unsigned char *buf=NULL;
         BN_CTX *ctx=NULL;
 
+        BN_init(&f);
+        BN_init(&ret);
+
         /* Body of this routine removed for OpenBSD - will return
          * when the RSA patent expires
          */
@@ -209,6 +212,9 @@ static int RSA_eay_private_decrypt(int flen, unsigned char *from,
         unsigned char *buf=NULL;
         BN_CTX *ctx=NULL;
 
+        BN_init(&f);
+        BN_init(&ret);
+
         /* Body of this routine removed for OpenBSD - will return
          * when the RSA patent expires
          */
@@ -234,6 +240,9 @@ static int RSA_eay_public_decrypt(int flen, unsigned char *from,
         unsigned char *buf=NULL;
         BN_CTX *ctx=NULL;
 
+        BN_init(&f);
+        BN_init(&ret);
+
         /* Body of this routine removed for OpenBSD - will return
          * when the RSA patent expires
          */
@@ -254,11 +263,11 @@ static int RSA_eay_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa)
         {
         BIGNUM r1,m1;
         int ret=0;
-        BN_CTX *ctx;
+        BN_CTX *ctx = NULL;
 
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
         BN_init(&m1);
         BN_init(&r1);
+        if ((ctx=BN_CTX_new()) == NULL) goto err;
 
         /* Body of this routine removed for OpenBSD - will return
          * when the RSA patent expires
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_eay.c b/src/lib/libssl/src/crypto/rsa/rsa_eay.c
index 179b7da90a..f835be8afc 100644
--- a/src/lib/libssl/src/crypto/rsa/rsa_eay.c
+++ b/src/lib/libssl/src/crypto/rsa/rsa_eay.c
@@ -184,6 +184,9 @@ static int RSA_eay_private_encrypt(int flen, unsigned char *from,
         unsigned char *buf=NULL;
         BN_CTX *ctx=NULL;
 
+        BN_init(&f);
+        BN_init(&ret);
+
         /* Body of this routine removed for OpenBSD - will return
          * when the RSA patent expires
          */
@@ -209,6 +212,9 @@ static int RSA_eay_private_decrypt(int flen, unsigned char *from,
         unsigned char *buf=NULL;
         BN_CTX *ctx=NULL;
 
+        BN_init(&f);
+        BN_init(&ret);
+
         /* Body of this routine removed for OpenBSD - will return
          * when the RSA patent expires
          */
@@ -234,6 +240,9 @@ static int RSA_eay_public_decrypt(int flen, unsigned char *from,
         unsigned char *buf=NULL;
         BN_CTX *ctx=NULL;
 
+        BN_init(&f);
+        BN_init(&ret);
+
         /* Body of this routine removed for OpenBSD - will return
          * when the RSA patent expires
          */
@@ -254,11 +263,11 @@ static int RSA_eay_mod_exp(BIGNUM *r0, BIGNUM *I, RSA *rsa)
         {
         BIGNUM r1,m1;
         int ret=0;
-        BN_CTX *ctx;
+        BN_CTX *ctx = NULL;
 
-        if ((ctx=BN_CTX_new()) == NULL) goto err;
         BN_init(&m1);
         BN_init(&r1);
+        if ((ctx=BN_CTX_new()) == NULL) goto err;
 
         /* Body of this routine removed for OpenBSD - will return
          * when the RSA patent expires