Update tunala so it builds ok with OPENSSL_NO_DEPRECATED, and improve the

[openssl.git] / demos / tunala / cb.c

diff --git a/demos/tunala/cb.c b/demos/tunala/cb.c
index e64983896ebb443a937ba6a635783c622cc1bc61..f6e452ae93579767944e8aba728c1a0efe0c4362 100644 (file)
--- a/demos/tunala/cb.c
+++ b/demos/tunala/cb.c
@@ -134,8 +134,27 @@ RSA *cb_generate_tmp_rsa(SSL *s, int is_export, int keylength)
        /* TODO: Perhaps make it so our global key can be generated on-the-fly
         * after certain intervals? */
        static RSA *rsa_tmp = NULL;
-       if(!rsa_tmp)
-               rsa_tmp = RSA_generate_key(keylength, RSA_F4, NULL, NULL);
+       BIGNUM *bn = NULL;
+       int ok = 1;
+       if(!rsa_tmp) {
+               ok = 0;
+               if(!(bn = BN_new()))
+                       goto end;
+               if(!BN_set_word(bn, RSA_F4))
+                       goto end;
+               if(!(rsa_tmp = RSA_new()))
+                       goto end;
+               if(!RSA_generate_key_ex(rsa_tmp, keylength, bn, NULL))
+                       goto end;
+               ok = 1;
+       }
+end:
+       if(bn)
+               BN_free(bn);
+       if(!ok) {
+               RSA_free(rsa_tmp);
+               rsa_tmp = NULL;
+       }
        return rsa_tmp;
 }