Deprecate quite a few recursive includes from the ssl.h API header and

[openssl.git] / ssl / ssltest.c

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 68eb6545725e25e576fe1761684c432242585621..f0b3c93ba5f0c6b2b7085e722fb0572e182fc4b9 100644 (file)
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -138,6 +138,10 @@
 #endif
 #include <openssl/err.h>
 #include <openssl/rand.h>
 #endif
 #include <openssl/err.h>
 #include <openssl/rand.h>

+#include <openssl/rsa.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
+#include <openssl/bn.h>

 
 #define _XOPEN_SOURCE_EXTENDED 1 /* Or gethostname won't be declared properly
                                     on Compaq platforms (at least with DEC C).
 
 #define _XOPEN_SOURCE_EXTENDED 1 /* Or gethostname won't be declared properly
                                     on Compaq platforms (at least with DEC C).


@@ -1609,17 +1613,19 @@ static RSA *rsa_tmp=NULL;
 
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
        {
 
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
        {

+       BIGNUM *bn = NULL;

        if (rsa_tmp == NULL)
                {
        if (rsa_tmp == NULL)
                {

+               bn = BN_new();

                rsa_tmp = RSA_new();
                rsa_tmp = RSA_new();

-               if(!rsa_tmp)
+               if(!bn || !rsa_tmp || !BN_set_word(bn, RSA_F4))

                        {
                        BIO_printf(bio_err, "Memory error...");
                        goto end;
                        }
                BIO_printf(bio_err,"Generating temp (%d bit) RSA key...",keylength);
                (void)BIO_flush(bio_err);
                        {
                        BIO_printf(bio_err, "Memory error...");
                        goto end;
                        }
                BIO_printf(bio_err,"Generating temp (%d bit) RSA key...",keylength);
                (void)BIO_flush(bio_err);

-               if(!RSA_generate_key_ex(rsa_tmp,keylength,RSA_F4,NULL))
+               if(!RSA_generate_key_ex(rsa_tmp,keylength,bn,NULL))

                        {
                        BIO_printf(bio_err, "Error generating key.");
                        RSA_free(rsa_tmp);
                        {
                        BIO_printf(bio_err, "Error generating key.");
                        RSA_free(rsa_tmp);


@@ -1629,6 +1635,7 @@ end:
                BIO_printf(bio_err,"\n");
                (void)BIO_flush(bio_err);
                }
                BIO_printf(bio_err,"\n");
                (void)BIO_flush(bio_err);
                }

+       if(bn) BN_free(bn);

        return(rsa_tmp);
        }
 
        return(rsa_tmp);
        }