summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc <>2012-07-13 05:48:26 +0000
committerjmc <>2012-07-13 05:48:26 +0000
commit0f58f66dd238ce3061b7055a4819e9945179f472 (patch)
tree2dca754a78912be9d01edb30993d28a1d741032e
parent1fb06e1accc33ae0bf2f979c7b2f9912c060b844 (diff)
downloadopenbsd-0f58f66dd238ce3061b7055a4819e9945179f472.tar.gz
openbsd-0f58f66dd238ce3061b7055a4819e9945179f472.tar.bz2
openbsd-0f58f66dd238ce3061b7055a4819e9945179f472.zip
put back the Key-Arg field - sess_id still prints it;
-rw-r--r--src/usr.sbin/openssl/openssl.17
1 files changed, 5 insertions, 2 deletions
diff --git a/src/usr.sbin/openssl/openssl.1 b/src/usr.sbin/openssl/openssl.1
index 80a22c6403..8ef5011411 100644
--- a/src/usr.sbin/openssl/openssl.1
+++ b/src/usr.sbin/openssl/openssl.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: openssl.1,v 1.88 2012/07/12 21:33:12 jmc Exp $ 1.\" $OpenBSD: openssl.1,v 1.89 2012/07/13 05:48:26 jmc Exp $
2.\" ==================================================================== 2.\" ====================================================================
3.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. 3.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
4.\" 4.\"
@@ -112,7 +112,7 @@
112.\" 112.\"
113.\" OPENSSL 113.\" OPENSSL
114.\" 114.\"
115.Dd $Mdocdate: July 12 2012 $ 115.Dd $Mdocdate: July 13 2012 $
116.Dt OPENSSL 1 116.Dt OPENSSL 1
117.Os 117.Os
118.Sh NAME 118.Sh NAME
@@ -7576,6 +7576,7 @@ SSL-Session:
7576 Session-ID: 871E62626C554CE95488823752CBD5F3673A3EF3DCE9C67BD916C809914B40ED 7576 Session-ID: 871E62626C554CE95488823752CBD5F3673A3EF3DCE9C67BD916C809914B40ED
7577 Session-ID-ctx: 01000000 7577 Session-ID-ctx: 01000000
7578 Master-Key: A7CEFC571974BE02CAC305269DC59F76EA9F0B180CB6642697A68251F2D2BB57E51DBBB4C7885573192AE9AEE220FACD 7578 Master-Key: A7CEFC571974BE02CAC305269DC59F76EA9F0B180CB6642697A68251F2D2BB57E51DBBB4C7885573192AE9AEE220FACD
7579 Key-Arg : None
7579 Start Time: 948459261 7580 Start Time: 948459261
7580 Timeout : 300 (sec) 7581 Timeout : 300 (sec)
7581 Verify return code 0 (ok) 7582 Verify return code 0 (ok)
@@ -7595,6 +7596,8 @@ The SSL session ID in hex format.
7595The session ID context in hex format. 7596The session ID context in hex format.
7596.It Ar Master-Key 7597.It Ar Master-Key
7597This is the SSL session master key. 7598This is the SSL session master key.
7599.It Ar Key-Arg
7600The key argument; this is only used in SSL v2.
7598.It Ar Start Time 7601.It Ar Start Time
7599This is the session start time, represented as an integer in standard 7602This is the session start time, represented as an integer in standard
7600.Ux 7603.Ux