fix error messages

[openssl.git] / apps / s_cb.c

diff --git a/apps/s_cb.c b/apps/s_cb.c
index e339a6ce5d5ea26c7c17049d2f2acba17bc116e0..58d0da8e97a4e6822c916e935ac6b5a0552c0dd3 100644 (file)
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -1533,3 +1533,82 @@ void print_ssl_summary(BIO *bio, SSL *s)
                ssl_print_tmp_key(bio, s);
        }
 
+void print_ssl_cert_checks(BIO *bio, SSL *s,
+                               const unsigned char *checkhost,
+                               const unsigned char *checkemail,
+                               const char *checkip)
+       {
+       X509 *peer;
+       peer = SSL_get_peer_certificate(s);
+       if (peer)
+               {
+               print_cert_checks(bio, peer, checkhost, checkemail, checkip);
+               X509_free(peer);
+               }
+       }
+
+int args_ssl(char ***pargs, int *pargc, SSL_CONF_CTX *cctx,
+                       int *badarg, BIO *err, STACK_OF(OPENSSL_STRING) **pstr)
+       {
+       char *arg = **pargs, *argn = (*pargs)[1];
+       int rv;
+
+       /* Attempt to run SSL configuration command */
+       rv = SSL_CONF_cmd_argv(cctx, pargc, pargs);
+       /* If parameter not recognised just return */
+       if (rv == 0)
+               return 0;
+       /* see if missing argument error */
+       if (rv == -3)
+               {
+               BIO_printf(err, "%s needs an argument\n", arg);
+               *badarg = 1;
+               goto end;
+               }
+       /* Check for some other error */
+       if (rv < 0)
+               {
+               BIO_printf(err, "Error with command: \"%s %s\"\n",
+                                               arg, argn ? argn : "");
+               *badarg = 1;
+               goto end;
+               }
+       /* Store command and argument */
+       /* If only one argument processed store value as NULL */
+       if (rv == 1)
+               argn = NULL;
+       if (!*pstr)
+               *pstr = sk_OPENSSL_STRING_new_null();
+       if (!*pstr || !sk_OPENSSL_STRING_push(*pstr, arg) ||
+                               !sk_OPENSSL_STRING_push(*pstr, argn))
+               {
+               BIO_puts(err, "Memory allocation failure\n");
+               goto end;
+               }
+
+       end:
+       if (*badarg)
+               ERR_print_errors(err);
+
+       return 1;
+       }
+
+int args_ssl_call(SSL_CTX *ctx, BIO *err, SSL_CONF_CTX *cctx,
+                                               STACK_OF(OPENSSL_STRING) *str)
+       {
+       int i;
+       SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
+       for (i = 0; i < sk_OPENSSL_STRING_num(str); i+= 2)
+               {
+               const char *param = sk_OPENSSL_STRING_value(str, i);
+               const char *value = sk_OPENSSL_STRING_value(str, i + 1);
+               if (SSL_CONF_cmd(cctx, param, value) <= 0)
+                       {
+                       BIO_printf(err, "Error with command: \"%s %s\"\n",
+                                               param, value ? value : "");
+                       ERR_print_errors(err);
+                       return 0;
+                       }
+               }
+       return 1;
+       }