Unify BSDi target.

[openssl.git] / apps / s_cb.c

diff --git a/apps/s_cb.c b/apps/s_cb.c
index 65cd0ff76be2ed55c2471493fbf35d1d84ca166e..9a35d46adc2866fabf00de08aad02f2e44988336 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -229,6 +229,34 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
        return(1);
        }
 
+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)
        {
@@ -255,7 +283,7 @@ long MS_CALLBACK bio_dump_callback(BIO *bio, int cmd, const char *argp,
 
 void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret)
        {
-       char *str;
+       const char *str;
        int w;
 
        w=where& ~SSL_ST_MASK;
@@ -318,14 +346,14 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
 
                if (len > 0)
                        {
-                       switch (((unsigned char*)buf)[0])
+                       switch (((const unsigned char*)buf)[0])
                                {
                                case 0:
                                        str_details1 = ", ERROR:";
                                        str_details2 = " ???";
                                        if (len >= 3)
                                                {
-                                               unsigned err = (((unsigned char*)buf)[1]<<8) + ((unsigned char*)buf)[2];
+                                               unsigned err = (((const unsigned char*)buf)[1]<<8) + ((const unsigned char*)buf)[2];
                                                
                                                switch (err)
                                                        {
@@ -394,7 +422,7 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                        
                        if (len == 2)
                                {
-                               switch (((unsigned char*)buf)[0])
+                               switch (((const unsigned char*)buf)[0])
                                        {
                                case 1:
                                        str_details1 = ", warning";
@@ -405,7 +433,7 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                                        }
 
                                str_details2 = " ???";
-                               switch (((unsigned char*)buf)[1])
+                               switch (((const unsigned char*)buf)[1])
                                        {
                                case 0:
                                        str_details2 = " close_notify";
@@ -486,7 +514,7 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
 
                        if (len > 0)
                                {
-                               switch (((unsigned char*)buf)[0])
+                               switch (((const unsigned char*)buf)[0])
                                        {
                                case 0:
                                        str_details1 = ", HelloRequest";
@@ -539,7 +567,7 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
                        {
                        if (i % 16 == 0 && i > 0)
                                BIO_printf(bio, "\n   ");
-                       BIO_printf(bio, " %02x", ((unsigned char*)buf)[i]);
+                       BIO_printf(bio, " %02x", ((const unsigned char*)buf)[i]);
                        }
                if (i < len)
                        BIO_printf(bio, " ...");