The first argument to load_iv should really be a char ** instead of an

[openssl.git] / apps / s_cb.c

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 1410178d6571fb73b7c3046fc7ded4c4c3e181aa..92d9ae8893159143375a7e32e239a8358deef6a2 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -229,8 +229,36 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
        return(1);
        }
 
-long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, int argi,
-            long argl, long ret)
+int set_cert_key_stuff(SSL_CTX *ctx, X509 *cert, EVP_PKEY *key)
+       {
+       if (cert ==  NULL)
+               return 1;
+       if (SSL_CTX_use_certificate(ctx,cert) <= 0)
+               {
+               BIO_printf(bio_err,"error setting certificate\n");
+               ERR_print_errors(bio_err);
+               return 0;
+               }
+       if (SSL_CTX_use_PrivateKey(ctx,key) <= 0)
+               {
+               BIO_printf(bio_err,"error setting private key\n");
+               ERR_print_errors(bio_err);
+               return 0;
+               }
+
+               
+               /* Now we know that a key and cert have been set against
+                * the SSL context */
+       if (!SSL_CTX_check_private_key(ctx))
+               {
+               BIO_printf(bio_err,"Private key does not match the certificate public key\n");
+               return 0;
+               }
+       return 1;
+       }
+
+long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
+       int argi, long argl, long ret)
        {
        BIO *out;
 
@@ -240,14 +268,14 @@ long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, int argi,
        if (cmd == (BIO_CB_READ|BIO_CB_RETURN))
                {
                BIO_printf(out,"read from %p [%p] (%d bytes => %ld (0x%lX))\n",
-                       bio,argp,argi,ret,ret);
+                       (void *)bio,argp,argi,ret,ret);
                BIO_dump(out,argp,(int)ret);
                return(ret);
                }
        else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN))
                {
                BIO_printf(out,"write to %p [%p] (%d bytes => %ld (0x%lX))\n",
-                       bio,argp,argi,ret,ret);
+                       (void *)bio,argp,argi,ret,ret);
                BIO_dump(out,argp,(int)ret);
                }
        return(ret);