diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:54:31 +0200 |
| commit | 5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8 (patch) | |
| tree | c800a66664ea3af61eb13928db45a26275930b0b /openssl/doc | |
| parent | d79e641dea89c0d5d651b11971c4c9e14df34629 (diff) | |
| parent | 67326634496ef21b4acbf4cef2f05040d34aef9b (diff) | |
| download | vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.gz vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.tar.bz2 vcxsrv-5564e91e3cf4ba5cb2fbebbc2d63d18f588016b8.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Configure
openssl/Makefile
openssl/crypto/opensslconf.h
openssl/util/mk1mf.pl
openssl/util/pl/VC-32.pl
Diffstat (limited to 'openssl/doc')
| -rw-r--r-- | openssl/doc/apps/genpkey.pod | 2 | ||||
| -rw-r--r-- | openssl/doc/apps/openssl.pod | 4 | ||||
| -rw-r--r-- | openssl/doc/ssl/SSL_alert_type_string.pod | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/openssl/doc/apps/genpkey.pod b/openssl/doc/apps/genpkey.pod index 1611b5ca7..c74d097fb 100644 --- a/openssl/doc/apps/genpkey.pod +++ b/openssl/doc/apps/genpkey.pod @@ -114,6 +114,8 @@ hexadecimal value if preceded by B<0x>. Default value is 65537. The number of bits in the generated parameters. If not specified 1024 is used. +=back + =head1 DH PARAMETER GENERATION OPTIONS =over 4 diff --git a/openssl/doc/apps/openssl.pod b/openssl/doc/apps/openssl.pod index 738142e9f..64a160c20 100644 --- a/openssl/doc/apps/openssl.pod +++ b/openssl/doc/apps/openssl.pod @@ -287,8 +287,6 @@ SHA Digest SHA-1 Digest -=back - =item B<sha224> SHA-224 Digest @@ -305,6 +303,8 @@ SHA-384 Digest SHA-512 Digest +=back + =head2 ENCODING AND CIPHER COMMANDS =over 10 diff --git a/openssl/doc/ssl/SSL_alert_type_string.pod b/openssl/doc/ssl/SSL_alert_type_string.pod index 94e28cc30..0329c3486 100644 --- a/openssl/doc/ssl/SSL_alert_type_string.pod +++ b/openssl/doc/ssl/SSL_alert_type_string.pod @@ -214,6 +214,11 @@ satisfy a request; the process might receive security parameters difficult to communicate changes to these parameters after that point. This message is always a warning. +=item "UP"/"unknown PSK identity" + +Sent by the server to indicate that it does not recognize a PSK +identity or an SRP identity. + =item "UK"/"unknown" This indicates that no description is available for this alert type. |