Move DSA test in ca.c inside #ifdef and make pubkey BIT STRING always have

[openssl.git] / apps / s_cb.c

diff --git a/apps/s_cb.c b/apps/s_cb.c
index cd086bb93ed02251f4e64926ef94b8912d8fe89d..7fa855c5dcf74b136f3a7660aba8833aa4211ebd 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -130,8 +130,10 @@ char *key_file;
        {
        if (cert_file != NULL)
                {
+               /*
                SSL *ssl;
                X509 *x509;
+               */
 
                if (SSL_CTX_use_certificate_file(ctx,cert_file,
                        SSL_FILETYPE_PEM) <= 0)
@@ -149,6 +151,8 @@ char *key_file;
                        return(0);
                        }
 
+               /*
+               In theory this is no longer needed 
                ssl=SSL_new(ctx);
                x509=SSL_get_certificate(ssl);
 
@@ -156,6 +160,7 @@ char *key_file;
                        EVP_PKEY_copy_parameters(X509_get_pubkey(x509),
                                SSL_get_privatekey(ssl));
                SSL_free(ssl);
+               */
 
                /* If we are using DSA, we can copy the parameters from
                 * the private key */