common/ssl_calls.c

diff --git a/common/ssl_calls.c b/common/ssl_calls.c

index 3d37ed6..aa9f09d 100644

--- a/common/ssl_calls.c

+++ b/common/ssl_calls.c

@@ -185,10 +185,10 @@

             char* mod, int mod_len, char* exp, int exp_len)

 {

   BN_CTX* ctx;

-  BIGNUM lmod;

-  BIGNUM lexp;

-  BIGNUM lin;

-  BIGNUM lout;

+  BIGNUM* lmod;

+  BIGNUM* lexp;

+  BIGNUM* lin;

+  BIGNUM* lout;

   int rv;

   char* l_out;

   char* l_in;

@@ -206,15 +206,15 @@

   ssl_reverse_it(l_mod, mod_len);

   ssl_reverse_it(l_exp, exp_len);

   ctx = BN_CTX_new();

-  BN_init(&lmod);

-  BN_init(&lexp);

-  BN_init(&lin);

-  BN_init(&lout);

-  BN_bin2bn((tui8*)l_mod, mod_len, &lmod);

-  BN_bin2bn((tui8*)l_exp, exp_len, &lexp);

-  BN_bin2bn((tui8*)l_in, in_len, &lin);

-  BN_mod_exp(&lout, &lin, &lexp, &lmod, ctx);

-  rv = BN_bn2bin(&lout, (tui8*)l_out);

+  lmod = BN_new();

+  lexp = BN_new();

+  lin = BN_new();

+  lout = BN_new();

+  BN_bin2bn((tui8*)l_mod, mod_len, lmod);

+  BN_bin2bn((tui8*)l_exp, exp_len, lexp);

+  BN_bin2bn((tui8*)l_in, in_len, lin);

+  BN_mod_exp(lout, lin, lexp, lmod, ctx);

+  rv = BN_bn2bin(lout, (tui8*)l_out);

   if (rv <= out_len)

   {

     ssl_reverse_it(l_out, rv);

@@ -224,10 +224,10 @@

   {

     rv = 0;

   }

-  BN_free(&lin);

-  BN_free(&lout);

-  BN_free(&lexp);

-  BN_free(&lmod);

+  BN_free(lin);

+  BN_free(lout);

+  BN_free(lexp);

+  BN_free(lmod);

   BN_CTX_free(ctx);

   g_free(l_out);

   g_free(l_in);

@@ -314,6 +314,8 @@

   char* lpri;

   int error;

   int len;

+  const BIGNUM* key_n;

+  const BIGNUM* key_d;

   if ((exp_len != 4) || (mod_len != 64) || (pri_len != 64))

   {

@@ -330,22 +332,26 @@

   error = RSA_generate_key_ex(my_key, key_size_in_bits, my_e, 0) == 0;

   if (error == 0)

   {

-    len = BN_num_bytes(my_key->n);

+    RSA_get0_key(my_key, &key_n, NULL, &key_d);

+  }

+  if (error == 0)

+  {

+    len = BN_num_bytes(key_n);

     error = len != mod_len;

   }

   if (error == 0)

   {

-    BN_bn2bin(my_key->n, (tui8*)lmod);

+    BN_bn2bin(key_n, (tui8*)lmod);

     ssl_reverse_it(lmod, mod_len);

   }

   if (error == 0)

   {

-    len = BN_num_bytes(my_key->d);

+    len = BN_num_bytes(key_d);

     error = len != pri_len;

   }

   if (error == 0)

   {

-    BN_bn2bin(my_key->d, (tui8*)lpri);

+    BN_bn2bin(key_d, (tui8*)lpri);

     ssl_reverse_it(lpri, pri_len);

   }

   if (error == 0)