From c6db285cf151a049bedc7474c2cd3a3d2d5510d1 Mon Sep 17 00:00:00 2001
From: jmc <>
Date: Mon, 14 Sep 2015 14:29:30 +0000
Subject: some conn_version and conn_cipher bits;

---
 src/lib/libtls/Makefile   |  4 +++-
 src/lib/libtls/tls_init.3 | 15 +++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/lib')

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 @@
-#	$OpenBSD: Makefile,v 1.19 2015/09/12 21:00:38 beck Exp $
+#	$OpenBSD: Makefile,v 1.20 2015/09/14 14:29:30 jmc Exp $
 
 CFLAGS+= -Wall -Werror -Wimplicit
 CFLAGS+= -DLIBRESSL_INTERNAL
@@ -52,6 +52,8 @@ MLINKS+=tls_init.3 tls_peer_cert_contains_name.3
 MLINKS+=tls_init.3 tls_peer_cert_issuer.3
 MLINKS+=tls_init.3 tls_peer_cert_subject.3
 MLINKS+=tls_init.3 tls_peer_cert_hash.3
+MLINKS+=tls_init.3 tls_conn_version.3
+MLINKS+=tls_init.3 tls_conn_cipher.3
 MLINKS+=tls_init.3 tls_load_file.3
 MLINKS+=tls_init.3 tls_client.3
 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 @@
-.\" $OpenBSD: tls_init.3,v 1.45 2015/09/14 12:05:33 schwarze Exp $
+.\" $OpenBSD: tls_init.3,v 1.46 2015/09/14 14:29:30 jmc Exp $
 .\"
 .\" Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
 .\"
@@ -48,6 +48,8 @@
 .Nm tls_peer_cert_issuer ,
 .Nm tls_peer_cert_subject ,
 .Nm tls_peer_cert_hash ,
+.Nm tls_conn_version ,
+.Nm tls_conn_cipher ,
 .Nm tls_load_file ,
 .Nm tls_client ,
 .Nm tls_server ,
@@ -420,23 +422,20 @@ can be generated using the commands:
 h=$(openssl x509 -outform der -in mycert.crt | sha256)
 printf "SHA256:${h}\\n"
 .Ed
-.Pp
 .It
 .Fn tls_conn_version
 returns a string
 corresponding to a TLS version negotiated with the peer
-connected to 
-.Ar ctx
-.It
+connected to
+.Ar ctx .
 .Fn tls_conn_version
 will only succeed after the handshake is complete.
 .It
 .Fn tls_conn_cipher
 returns a string
 corresponding to a the cipher suite negotated with the peer
-connected to 
-.Ar ctx
-.It
+connected to
+.Ar ctx .
 .Fn tls_conn_cipher
 will only succeed after the handshake is complete.
 .Em (Server and client)
-- 
cgit v1.2.3-55-g6feb