1 diff -up openssl-1.0.1h/doc/apps/ec.pod.manfix openssl-1.0.1h/doc/apps/ec.pod
2 --- openssl-1.0.1h/doc/apps/ec.pod.manfix 2014-06-05 11:41:31.000000000 +0200
3 +++ openssl-1.0.1h/doc/apps/ec.pod 2014-06-05 14:41:11.501274915 +0200
4 @@ -93,10 +93,6 @@ prints out the public, private key compo
6 this option prevents output of the encoded version of the key.
10 -this option prints out the value of the public key component of the key.
14 by default a private key is read from the input file: with this option a
15 diff -up openssl-1.0.1h/doc/apps/openssl.pod.manfix openssl-1.0.1h/doc/apps/openssl.pod
16 --- openssl-1.0.1h/doc/apps/openssl.pod.manfix 2014-06-05 11:41:31.000000000 +0200
17 +++ openssl-1.0.1h/doc/apps/openssl.pod 2014-06-05 14:41:11.501274915 +0200
18 @@ -163,7 +163,7 @@ Create or examine a netscape certificate
20 Online Certificate Status Protocol utility.
22 -=item L<B<passwd>|passwd(1)>
23 +=item L<B<passwd>|sslpasswd(1)>
25 Generation of hashed passwords.
27 @@ -187,7 +187,7 @@ Public key algorithm parameter managemen
29 Public key algorithm cryptographic operation utility.
31 -=item L<B<rand>|rand(1)>
32 +=item L<B<rand>|sslrand(1)>
34 Generate pseudo-random bytes.
36 @@ -401,9 +401,9 @@ L<crl(1)|crl(1)>, L<crl2pkcs7(1)|crl2pkc
37 L<dhparam(1)|dhparam(1)>, L<dsa(1)|dsa(1)>, L<dsaparam(1)|dsaparam(1)>,
38 L<enc(1)|enc(1)>, L<gendsa(1)|gendsa(1)>, L<genpkey(1)|genpkey(1)>,
39 L<genrsa(1)|genrsa(1)>, L<nseq(1)|nseq(1)>, L<openssl(1)|openssl(1)>,
40 -L<passwd(1)|passwd(1)>,
41 +L<sslpasswd(1)|sslpasswd(1)>,
42 L<pkcs12(1)|pkcs12(1)>, L<pkcs7(1)|pkcs7(1)>, L<pkcs8(1)|pkcs8(1)>,
43 -L<rand(1)|rand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>,
44 +L<sslrand(1)|sslrand(1)>, L<req(1)|req(1)>, L<rsa(1)|rsa(1)>,
45 L<rsautl(1)|rsautl(1)>, L<s_client(1)|s_client(1)>,
46 L<s_server(1)|s_server(1)>, L<s_time(1)|s_time(1)>,
47 L<smime(1)|smime(1)>, L<spkac(1)|spkac(1)>,
48 diff -up openssl-1.0.1h/doc/apps/s_client.pod.manfix openssl-1.0.1h/doc/apps/s_client.pod
49 --- openssl-1.0.1h/doc/apps/s_client.pod.manfix 2014-06-05 14:41:11.445273605 +0200
50 +++ openssl-1.0.1h/doc/apps/s_client.pod 2014-06-05 14:41:11.501274915 +0200
51 @@ -33,9 +33,14 @@ B<openssl> B<s_client>
64 [B<-cipher cipherlist>]
65 [B<-starttls protocol>]
66 @@ -45,6 +50,7 @@ B<openssl> B<s_client>
67 [B<-sess_out filename>]
68 [B<-sess_in filename>]
70 +[B<-nextprotoneg protocols>]
74 @@ -188,7 +194,7 @@ Use the PSK key B<key> when using a PSK
75 given as a hexadecimal number without leading 0x, for example -psk
78 -=item B<-ssl2>, B<-ssl3>, B<-tls1>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1>
79 +=item B<-ssl2>, B<-ssl3>, B<-tls1>, B<-tls1_1>, B<-tls1_2>, B<-dtls1>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1>, B<-no_tls1_1>, B<-no_tls1_2>
81 these options disable the use of certain SSL or TLS protocols. By default
82 the initial handshake uses a method which should be compatible with all
83 @@ -249,6 +255,17 @@ Multiple files can be specified separate
84 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
87 +=item B<-nextprotoneg protocols>
89 +enable Next Protocol Negotiation TLS extension and provide a list of
90 +comma-separated protocol names that the client should advertise
91 +support for. The list should contain most wanted protocols first.
92 +Protocol names are printable ASCII strings, for example "http/1.1" or
94 +Empty list of protocols is treated specially and will cause the client to
95 +advertise support for the TLS extension but disconnect just after
96 +reciving ServerHello with a list of server supported protocols.
100 =head1 CONNECTED COMMANDS
101 diff -up openssl-1.0.1h/doc/apps/s_server.pod.manfix openssl-1.0.1h/doc/apps/s_server.pod
102 --- openssl-1.0.1h/doc/apps/s_server.pod.manfix 2014-06-05 11:41:31.000000000 +0200
103 +++ openssl-1.0.1h/doc/apps/s_server.pod 2014-06-05 14:41:11.502274939 +0200
104 @@ -55,6 +55,7 @@ B<openssl> B<s_server>
108 +[B<-nextprotoneg protocols>]
112 @@ -207,7 +208,7 @@ Use the PSK key B<key> when using a PSK
113 given as a hexadecimal number without leading 0x, for example -psk
116 -=item B<-ssl2>, B<-ssl3>, B<-tls1>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1>
117 +=item B<-ssl2>, B<-ssl3>, B<-tls1>, B<-tls1_1>, B<-tls1_2>, B<-dtls1>, B<-no_ssl2>, B<-no_ssl3>, B<-no_tls1>, B<-no_tls1_1>, B<-no_tls1_2>
119 these options disable the use of certain SSL or TLS protocols. By default
120 the initial handshake uses a method which should be compatible with all
121 @@ -282,6 +283,14 @@ Multiple files can be specified separate
122 The separator is B<;> for MS-Windows, B<,> for OpenVMS, and B<:> for
125 +=item B<-nextprotoneg protocols>
127 +enable Next Protocol Negotiation TLS extension and provide a
128 +comma-separated list of supported protocol names.
129 +The list should contain most wanted protocols first.
130 +Protocol names are printable ASCII strings, for example "http/1.1" or
135 =head1 CONNECTED COMMANDS