wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Print Ed25519 in s_client/s_server

Browse source 
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3585)
This commit is contained in:
Dr. Stephen Henson 2017-05-24 14:56:17 +01:00
parent 881d2c5ed2
commit 03327c8bf2
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/s_cb.c
View file

@ -230,6 +230,9 @@ static const char *get_sigtype(int nid)
case EVP_PKEY_EC: case EVP_PKEY_EC:
return "ECDSA"; return "ECDSA";
case NID_ED25519:
return "Ed25519";
default: default:
return NULL; return NULL;
} }
@ -265,13 +268,13 @@ static int do_print_sigalgs(BIO *out, SSL *s, int shared)
BIO_puts(out, ":"); BIO_puts(out, ":");
sstr = get_sigtype(sign_nid); sstr = get_sigtype(sign_nid);
if (sstr) if (sstr)
BIO_printf(out, "%s+", sstr); BIO_printf(out, "%s", sstr);
else else
BIO_printf(out, "0x%02X+", (int)rsign); BIO_printf(out, "0x%02X", (int)rsign);
if (hash_nid != NID_undef) if (hash_nid != NID_undef)
BIO_printf(out, "%s", OBJ_nid2sn(hash_nid)); BIO_printf(out, "+%s", OBJ_nid2sn(hash_nid));
else else if (sstr == NULL)
BIO_printf(out, "0x%02X", (int)rhash); BIO_printf(out, "+0x%02X", (int)rhash);
} }
BIO_puts(out, "\n"); BIO_puts(out, "\n");
return 1; return 1;
@ -284,7 +287,7 @@ int ssl_print_sigalgs(BIO *out, SSL *s)
ssl_print_client_cert_types(out, s); ssl_print_client_cert_types(out, s);
do_print_sigalgs(out, s, 0); do_print_sigalgs(out, s, 0);
do_print_sigalgs(out, s, 1); do_print_sigalgs(out, s, 1);
if (SSL_get_peer_signature_nid(s, &nid)) if (SSL_get_peer_signature_nid(s, &nid) && nid != NID_undef)
BIO_printf(out, "Peer signing digest: %s\n", OBJ_nid2sn(nid)); BIO_printf(out, "Peer signing digest: %s\n", OBJ_nid2sn(nid));
if (SSL_get_peer_signature_type_nid(s, &nid)) if (SSL_get_peer_signature_type_nid(s, &nid))
BIO_printf(out, "Peer signature type: %s\n", get_sigtype(nid)); BIO_printf(out, "Peer signature type: %s\n", get_sigtype(nid));