diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libtls/Makefile | 4 | ||||
| -rw-r--r-- | src/lib/libtls/tls_init.3 | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/lib/libtls/Makefile b/src/lib/libtls/Makefile index 6e5914685c..2e6c48716c 100644 --- a/src/lib/libtls/Makefile +++ b/src/lib/libtls/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.19 2015/09/12 21:00:38 beck Exp $ | 1 | # $OpenBSD: Makefile,v 1.20 2015/09/14 14:29:30 jmc Exp $ |
| 2 | 2 | ||
| 3 | CFLAGS+= -Wall -Werror -Wimplicit | 3 | CFLAGS+= -Wall -Werror -Wimplicit |
| 4 | CFLAGS+= -DLIBRESSL_INTERNAL | 4 | CFLAGS+= -DLIBRESSL_INTERNAL |
| @@ -52,6 +52,8 @@ MLINKS+=tls_init.3 tls_peer_cert_contains_name.3 | |||
| 52 | MLINKS+=tls_init.3 tls_peer_cert_issuer.3 | 52 | MLINKS+=tls_init.3 tls_peer_cert_issuer.3 |
| 53 | MLINKS+=tls_init.3 tls_peer_cert_subject.3 | 53 | MLINKS+=tls_init.3 tls_peer_cert_subject.3 |
| 54 | MLINKS+=tls_init.3 tls_peer_cert_hash.3 | 54 | MLINKS+=tls_init.3 tls_peer_cert_hash.3 |
| 55 | MLINKS+=tls_init.3 tls_conn_version.3 | ||
| 56 | MLINKS+=tls_init.3 tls_conn_cipher.3 | ||
| 55 | MLINKS+=tls_init.3 tls_load_file.3 | 57 | MLINKS+=tls_init.3 tls_load_file.3 |
| 56 | MLINKS+=tls_init.3 tls_client.3 | 58 | MLINKS+=tls_init.3 tls_client.3 |
| 57 | MLINKS+=tls_init.3 tls_server.3 | 59 | MLINKS+=tls_init.3 tls_server.3 |
diff --git a/src/lib/libtls/tls_init.3 b/src/lib/libtls/tls_init.3 index 81ab97b0c4..fbd6cb5e12 100644 --- a/src/lib/libtls/tls_init.3 +++ b/src/lib/libtls/tls_init.3 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | .\" $OpenBSD: tls_init.3,v 1.45 2015/09/14 12:05:33 schwarze Exp $ | 1 | .\" $OpenBSD: tls_init.3,v 1.46 2015/09/14 14:29:30 jmc Exp $ |
| 2 | .\" | 2 | .\" |
| 3 | .\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> | 3 | .\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org> |
| 4 | .\" | 4 | .\" |
| @@ -48,6 +48,8 @@ | |||
| 48 | .Nm tls_peer_cert_issuer , | 48 | .Nm tls_peer_cert_issuer , |
| 49 | .Nm tls_peer_cert_subject , | 49 | .Nm tls_peer_cert_subject , |
| 50 | .Nm tls_peer_cert_hash , | 50 | .Nm tls_peer_cert_hash , |
| 51 | .Nm tls_conn_version , | ||
| 52 | .Nm tls_conn_cipher , | ||
| 51 | .Nm tls_load_file , | 53 | .Nm tls_load_file , |
| 52 | .Nm tls_client , | 54 | .Nm tls_client , |
| 53 | .Nm tls_server , | 55 | .Nm tls_server , |
| @@ -420,23 +422,20 @@ can be generated using the commands: | |||
| 420 | h=$(openssl x509 -outform der -in mycert.crt | sha256) | 422 | h=$(openssl x509 -outform der -in mycert.crt | sha256) |
| 421 | printf "SHA256:${h}\\n" | 423 | printf "SHA256:${h}\\n" |
| 422 | .Ed | 424 | .Ed |
| 423 | .Pp | ||
| 424 | .It | 425 | .It |
| 425 | .Fn tls_conn_version | 426 | .Fn tls_conn_version |
| 426 | returns a string | 427 | returns a string |
| 427 | corresponding to a TLS version negotiated with the peer | 428 | corresponding to a TLS version negotiated with the peer |
| 428 | connected to | 429 | connected to |
| 429 | .Ar ctx | 430 | .Ar ctx . |
| 430 | .It | ||
| 431 | .Fn tls_conn_version | 431 | .Fn tls_conn_version |
| 432 | will only succeed after the handshake is complete. | 432 | will only succeed after the handshake is complete. |
| 433 | .It | 433 | .It |
| 434 | .Fn tls_conn_cipher | 434 | .Fn tls_conn_cipher |
| 435 | returns a string | 435 | returns a string |
| 436 | corresponding to a the cipher suite negotated with the peer | 436 | corresponding to a the cipher suite negotated with the peer |
| 437 | connected to | 437 | connected to |
| 438 | .Ar ctx | 438 | .Ar ctx . |
| 439 | .It | ||
| 440 | .Fn tls_conn_cipher | 439 | .Fn tls_conn_cipher |
| 441 | will only succeed after the handshake is complete. | 440 | will only succeed after the handshake is complete. |
| 442 | .Em (Server and client) | 441 | .Em (Server and client) |
