diff options
-rw-r--r-- | src/usr.bin/nc/netcat.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c index a224717c72..2e7c3d3748 100644 --- a/src/usr.bin/nc/netcat.c +++ b/src/usr.bin/nc/netcat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: netcat.c,v 1.146 2015/12/08 15:33:33 beck Exp $ */ | 1 | /* $OpenBSD: netcat.c,v 1.147 2015/12/16 14:23:33 beck Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> | 3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> |
4 | * Copyright (c) 2015 Bob Beck. All rights reserved. | 4 | * Copyright (c) 2015 Bob Beck. All rights reserved. |
@@ -1466,7 +1466,7 @@ map_tls(char *s, int *val) | |||
1466 | void | 1466 | void |
1467 | report_tls(struct tls * tls_ctx, char * host, char *tls_expectname) | 1467 | report_tls(struct tls * tls_ctx, char * host, char *tls_expectname) |
1468 | { | 1468 | { |
1469 | char *subject = NULL, *issuer = NULL; | 1469 | time_t t; |
1470 | fprintf(stderr, "TLS handshake negotiated %s/%s with host %s\n", | 1470 | fprintf(stderr, "TLS handshake negotiated %s/%s with host %s\n", |
1471 | tls_conn_version(tls_ctx), tls_conn_cipher(tls_ctx), host); | 1471 | tls_conn_version(tls_ctx), tls_conn_cipher(tls_ctx), host); |
1472 | fprintf(stderr, "Peer name %s\n", | 1472 | fprintf(stderr, "Peer name %s\n", |
@@ -1477,12 +1477,15 @@ report_tls(struct tls * tls_ctx, char * host, char *tls_expectname) | |||
1477 | if (tls_peer_cert_issuer(tls_ctx)) | 1477 | if (tls_peer_cert_issuer(tls_ctx)) |
1478 | fprintf(stderr, "Issuer: %s\n", | 1478 | fprintf(stderr, "Issuer: %s\n", |
1479 | tls_peer_cert_issuer(tls_ctx)); | 1479 | tls_peer_cert_issuer(tls_ctx)); |
1480 | if ((t = tls_peer_cert_notbefore(tls_ctx)) != -1) | ||
1481 | fprintf(stderr, "Valid From: %s", ctime(&t)); | ||
1482 | if ((t = tls_peer_cert_notafter(tls_ctx)) != -1) | ||
1483 | fprintf(stderr, "Valid Until: %s", ctime(&t)); | ||
1480 | if (tls_peer_cert_hash(tls_ctx)) | 1484 | if (tls_peer_cert_hash(tls_ctx)) |
1481 | fprintf(stderr, "Cert Hash: %s\n", | 1485 | fprintf(stderr, "Cert Hash: %s\n", |
1482 | tls_peer_cert_hash(tls_ctx)); | 1486 | tls_peer_cert_hash(tls_ctx)); |
1483 | free(subject); | ||
1484 | free(issuer); | ||
1485 | } | 1487 | } |
1488 | |||
1486 | void | 1489 | void |
1487 | report_connect(const struct sockaddr *sa, socklen_t salen) | 1490 | report_connect(const struct sockaddr *sa, socklen_t salen) |
1488 | { | 1491 | { |