diff options
| author | Dmitry Belyavskiy <beldmit@gmail.com> | 2017-02-21 14:22:55 +0300 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-02-21 13:50:00 -0500 |
| commit | a7c04f2b540cce99055326a3ab932032bdf48cf5 (patch) | |
| tree | 09800f489155c1ea78e9bd0e70f602b54b81efa6 /apps/s_cb.c | |
| parent | ecca16632a73bb80ee27cdec8a97f6def0a4714d (diff) | |
Provided support for the -nameopt flag in s_client, s_server and s_time
commands.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2695)
Diffstat (limited to 'apps/s_cb.c')
| -rw-r--r-- | apps/s_cb.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/apps/s_cb.c b/apps/s_cb.c index 0111c24e96..89033d5ddd 100644 --- a/apps/s_cb.c +++ b/apps/s_cb.c @@ -33,6 +33,12 @@ static unsigned char cookie_secret[COOKIE_SECRET_LENGTH]; static int cookie_initialized = 0; #endif static BIO *bio_keylog = NULL; +static unsigned long nmflag = XN_FLAG_ONELINE; + +int set_nameopt(const char *arg) +{ + return set_name_ex(&nmflag, arg); +} static const char *lookup(int val, const STRINT_PAIR* list, const char* def) { @@ -56,7 +62,7 @@ int verify_callback(int ok, X509_STORE_CTX *ctx) if (err_cert) { X509_NAME_print_ex(bio_err, X509_get_subject_name(err_cert), - 0, XN_FLAG_ONELINE); + 0, nmflag); BIO_puts(bio_err, "\n"); } else BIO_puts(bio_err, "<no cert>\n"); @@ -77,7 +83,7 @@ int verify_callback(int ok, X509_STORE_CTX *ctx) case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT: BIO_puts(bio_err, "issuer= "); X509_NAME_print_ex(bio_err, X509_get_issuer_name(err_cert), - 0, XN_FLAG_ONELINE); + 0, nmflag); BIO_puts(bio_err, "\n"); break; case X509_V_ERR_CERT_NOT_YET_VALID: @@ -813,7 +819,7 @@ static int set_cert_cb(SSL *ssl, void *arg) rv = SSL_check_chain(ssl, exc->cert, exc->key, exc->chain); BIO_printf(bio_err, "Checking cert chain %d:\nSubject: ", i); X509_NAME_print_ex(bio_err, X509_get_subject_name(exc->cert), 0, - XN_FLAG_ONELINE); + nmflag); BIO_puts(bio_err, "\n"); print_chain_flags(ssl, rv); if (rv & CERT_PKEY_VALID) { @@ -1103,7 +1109,7 @@ void print_ssl_summary(SSL *s) BIO_puts(bio_err, "Peer certificate: "); X509_NAME_print_ex(bio_err, X509_get_subject_name(peer), - 0, XN_FLAG_ONELINE); + 0, nmflag); BIO_puts(bio_err, "\n"); if (SSL_get_peer_signature_nid(s, &nid)) BIO_printf(bio_err, "Hash used: %s\n", OBJ_nid2sn(nid)); |