Use the default_md config file value when signing CRLs.

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index c342a2ba66f9acb0fad4b8baeb084f15f748d2ef..cce835c23902d53c43b3038011c74b9f5056547e 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1054,7 +1054,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
        if (s_debug)
                {
                con->debug=1;
-               BIO_set_callback(SSL_get_rbio(con),bio_dump_cb);
+               BIO_set_callback(SSL_get_rbio(con),bio_dump_callback);
                BIO_set_callback_arg(SSL_get_rbio(con),bio_s_out);
                }
        if (s_msg)
@@ -1457,7 +1457,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
        if (s_debug)
                {
                con->debug=1;
-               BIO_set_callback(SSL_get_rbio(con),bio_dump_cb);
+               BIO_set_callback(SSL_get_rbio(con),bio_dump_callback);
                BIO_set_callback_arg(SSL_get_rbio(con),bio_s_out);
                }
        if (s_msg)
@@ -1782,17 +1782,20 @@ err:
 #ifndef OPENSSL_NO_RSA
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
        {
+       BIGNUM *bn = NULL;
        static RSA *rsa_tmp=NULL;
 
-       if (rsa_tmp == NULL)
+       if (!rsa_tmp && ((bn = BN_new()) == NULL))
+               BIO_printf(bio_err,"Allocation error in generating RSA key\n");
+       if (!rsa_tmp && bn)
                {
                if (!s_quiet)
                        {
                        BIO_printf(bio_err,"Generating temp (%d bit) RSA key...",keylength);
                        (void)BIO_flush(bio_err);
                        }
-               if(((rsa_tmp = RSA_new()) == NULL) || !RSA_generate_key_ex(
-                                       rsa_tmp, keylength,RSA_F4,NULL))
+               if(!BN_set_word(bn, RSA_F4) || ((rsa_tmp = RSA_new()) == NULL) ||
+                               !RSA_generate_key_ex(rsa_tmp, keylength, bn, NULL))
                        {
                        if(rsa_tmp) RSA_free(rsa_tmp);
                        rsa_tmp = NULL;
@@ -1802,6 +1805,7 @@ static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
                        BIO_printf(bio_err,"\n");
                        (void)BIO_flush(bio_err);
                        }
+               BN_free(bn);
                }
        return(rsa_tmp);
        }