[openssl-commits] [openssl] master update

[Paul I. Dale]

The branch master has been updated
       via  f3002a2ed3645d8d6e1511424b3f5e89f6117edf (commit)
      from  8ddbff9c0811a0f11855eda871b9d3bff8fb325e (commit)


- Log -----------------------------------------------------------------
commit f3002a2ed3645d8d6e1511424b3f5e89f6117edf
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Tue Oct 2 09:25:59 2018 +1000

    Change DRBG's to DRBGs
    
    Minor change to documentation of RAND_DRBG_set_defaults()
    
    Reviewed-by: Paul Yang <yang.yang at baishancloud.com>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/7326)

-----------------------------------------------------------------------

Summary of changes:
 doc/man3/RAND_DRBG_new.pod | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/man3/RAND_DRBG_new.pod b/doc/man3/RAND_DRBG_new.pod
index 125e60d..9705a7b 100644
--- a/doc/man3/RAND_DRBG_new.pod
+++ b/doc/man3/RAND_DRBG_new.pod
@@ -56,7 +56,8 @@ NID_aes_128_ctr, NID_aes_192_ctr, NID_aes_256_ctr, NID_sha1, NID_sha224,
 NID_sha256, NID_sha384, NID_sha512, NID_sha512_224, NID_sha512_256,
 NID_sha3_224, NID_sha3_256, NID_sha3_384 or NID_sha3_512.
 
-If this method is not called then the default type is given by RAND_DRBG_TYPE.
+If this method is not called then the default type is given by NID_aes_256_ctr
+and the default flags are zero.
 
 Before the DRBG can be used to generate random bits, it is necessary to set
 its type and to instantiate it.
@@ -83,9 +84,8 @@ Enables use of HMAC instead of the HASH DRBG.
 
 These 3 flags can be used to set the individual DRBG types created. Multiple
 calls are required to set the types to different values. If none of these 3
-flags are used, then the same type and flags are used for all 3 DRBG's in the
-B<drbg> chain (<master>, <public> and <private>). The default used if this
-method is not called is to use RAND_DRBG_FLAGS.
+flags are used, then the same type and flags are used for all 3 DRBGs in the
+B<drbg> chain (<master>, <public> and <private>).
 
 =back