Commit 740ceb5b authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Various doc fixes from GH pull requests 



Thanks folks:
        348 Benjamin Kaduk
        317 Christian Brueffer
        254 Erik Tews
        253 Erik Tews
        219 Carl Mehner
        155 (ghost)
        95 mancha
        51 DominikNeubauer

Reviewed-by: default avatarDr. Stephen Henson <steve@openssl.org>
parent 898ea7b8

CHANGES

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ 
     [mancha <mancha1@zoho.com>]



  *) Fix eckey_priv_encode so it immediately returns an error upon a failure

     in i2d_ECPrivateKey.

     in i2d_ECPrivateKey.  Thanks to Ted Unangst for feedback on this issue.

     [mancha <mancha1@zoho.com>]



  *) Fix some double frees. These are not thought to be exploitable.

README

+1 −1
Original line number Diff line number Diff line 


 OpenSSL 1.1.0-dev



 Copyright (c) 1998-2011 The OpenSSL Project

 Copyright (c) 1998-2015 The OpenSSL Project

 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

 All rights reserved.

apps/s_client.c

+1 −1
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ OPTIONS s_client_options[] = { 
     "SRP username into second ClientHello message"},

    {"srp_moregroups", OPT_SRP_MOREGROUPS, '-',

     "Tolerate other than the known g N values."},

    {"srp_strength", OPT_SRP_STRENGTH, 'p', "Minimal mength in bits for N"},

    {"srp_strength", OPT_SRP_STRENGTH, 'p', "Minimal length in bits for N"},

#endif

#ifndef OPENSSL_NO_NEXTPROTONEG

    {"nextprotoneg", OPT_NEXTPROTONEG, 's',

doc/HOWTO/keys.txt

+2 −3
Original line number Diff line number Diff line
@@ -40,9 +40,8 @@ consider insecure or to be insecure pretty soon. 


3. To generate a DSA key



A DSA key can be used for signing only.  This is important to keep

in mind to know what kind of purposes a certificate request with a

DSA key can really be used for.

A DSA key can be used for signing only.  It is important to

know what a certificate request with a DSA key can really be used for.



Generating a key for the DSA algorithm is a two-step process.  First,

you have to generate parameters from which to generate the key:

doc/apps/pkcs12.pod

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ key is encrypted using triple DES and the certificate using 40 bit RC2. 


these options allow the algorithm used to encrypt the private key and

certificates to be selected. Any PKCS#5 v1.5 or PKCS#12 PBE algorithm name

can be used (see B<NOTES> section for more information). If a a cipher name

can be used (see B<NOTES> section for more information). If a cipher name

(as output by the B<list-cipher-algorithms> command is specified then it

is used with PKCS#5 v2.0. For interoperability reasons it is advisable to only

use PKCS#12 algorithms.