From 66cb29e64621fdd1aa5e377a395ff107d21a613b Mon Sep 17 00:00:00 2001 From: Shigeki Ohtsu Date: Thu, 29 Mar 2018 16:39:12 +0900 Subject: deps: upgrade openssl sources to 1.1.0h This updates all sources in deps/openssl/openssl with openssl-1.1.0h. Fixes: https://github.com/nodejs/node/issues/4270 PR-URL: https://github.com/nodejs/node/pull/19794 Reviewed-By: James M Snell Reviewed-By: Rod Vagg Reviewed-By: Michael Dawson --- .../openssl/doc/crypto/DH_generate_parameters.pod | 106 +++++++++++++++------ 1 file changed, 79 insertions(+), 27 deletions(-) (limited to 'deps/openssl/openssl/doc/crypto/DH_generate_parameters.pod') diff --git a/deps/openssl/openssl/doc/crypto/DH_generate_parameters.pod b/deps/openssl/openssl/doc/crypto/DH_generate_parameters.pod index 7f81a04d91..ce178af0be 100644 --- a/deps/openssl/openssl/doc/crypto/DH_generate_parameters.pod +++ b/deps/openssl/openssl/doc/crypto/DH_generate_parameters.pod @@ -2,22 +2,25 @@ =head1 NAME - DH_generate_parameters_ex, DH_generate_parameters, -DH_check - generate and check Diffie-Hellman parameters +DH_check, DH_check_params - generate and check Diffie-Hellman +parameters =head1 SYNOPSIS #include - int DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb); + int DH_generate_parameters_ex(DH *dh, int prime_len, int generator, BN_GENCB *cb); int DH_check(DH *dh, int *codes); + int DH_check_params(DH *dh, int *codes); Deprecated: + #if OPENSSL_API_COMPAT < 0x00908000L DH *DH_generate_parameters(int prime_len, int generator, void (*callback)(int, int, void *), void *cb_arg); + #endif =head1 DESCRIPTION @@ -27,31 +30,84 @@ structure. The pseudo-random number generator must be seeded prior to calling DH_generate_parameters(). B is the length in bits of the safe prime to be generated. -B is a small number E 1, typically 2 or 5. +B is a small number E 1, typically 2 or 5. A callback function may be used to provide feedback about the progress of the key generation. If B is not B, it will be -called as described in L while a random prime +called as described in L while a random prime number is generated, and when a prime has been found, B -is called. See L for information on +is called. See L for information on the BN_GENCB_call() function. -DH_check() validates Diffie-Hellman parameters. It checks that B

is -a safe prime, and that B is a suitable generator. In the case of an -error, the bit flags DH_CHECK_P_NOT_SAFE_PRIME or -DH_NOT_SUITABLE_GENERATOR are set in B<*codes>. -DH_UNABLE_TO_CHECK_GENERATOR is set if the generator cannot be -checked, i.e. it does not equal 2 or 5. +DH_check_params() confirms that the B

and B are likely enough to +be valid. +This is a lightweight check, if a more thorough check is needed, use +DH_check(). +The value of B<*codes> is updated with any problems found. +If B<*codes> is zero then no problems were found, otherwise the +following bits may be set: + +=over 4 + +=item DH_CHECK_P_NOT_PRIME + +The parameter B

has been determined to not being an odd prime. +Note that the lack of this bit doesn't guarantee that B

is a +prime. + +=item DH_NOT_SUITABLE_GENERATOR + +The generator B is not suitable. +Note that the lack of this bit doesn't guarantee that B is +suitable, unless B

is known to be a strong prime. + +=back + +DH_check() confirms that the Diffie-Hellman parameters B are valid. The +value of B<*codes> is updated with any problems found. If B<*codes> is zero then +no problems were found, otherwise the following bits may be set: + +=over 4 + +=item DH_CHECK_P_NOT_PRIME + +The parameter B

is not prime. + +=item DH_CHECK_P_NOT_SAFE_PRIME + +The parameter B

is not a safe prime and no B value is present. + +=item DH_UNABLE_TO_CHECK_GENERATOR + +The generator B cannot be checked for suitability. + +=item DH_NOT_SUITABLE_GENERATOR + +The generator B is not suitable. + +=item DH_CHECK_Q_NOT_PRIME + +The parameter B is not prime. + +=item DH_CHECK_INVALID_Q_VALUE + +The parameter B is invalid. + +=item DH_CHECK_INVALID_J_VALUE + +The parameter B is invalid. + +=back =head1 RETURN VALUES -DH_generate_parameters_ex() and DH_check() return 1 if the check could be -performed, 0 otherwise. +DH_generate_parameters_ex(), DH_check() and DH_check_params() return 1 +if the check could be performed, 0 otherwise. DH_generate_parameters() (deprecated) returns a pointer to the DH structure, or NULL if the parameter generation fails. -The error codes can be obtained by L. +The error codes can be obtained by L. =head1 NOTES @@ -61,22 +117,18 @@ hours before finding a suitable prime. The parameters generated by DH_generate_parameters_ex() and DH_generate_parameters() are not to be used in signature schemes. -=head1 BUGS - -If B is not 2 or 5, Bg>=B is not -a usable generator. - =head1 SEE ALSO -L, L, L, -L +L, L, L, +L -=head1 HISTORY +=head1 COPYRIGHT -DH_check() is available in all versions of SSLeay and OpenSSL. -The B argument to DH_generate_parameters() was added in SSLeay 0.9.0. +Copyright 2000-2016 The OpenSSL Project Authors. All Rights Reserved. -In versions before OpenSSL 0.9.5, DH_CHECK_P_NOT_STRONG_PRIME is used -instead of DH_CHECK_P_NOT_SAFE_PRIME. +Licensed under the OpenSSL license (the "License"). You may not use +this file except in compliance with the License. You can obtain a copy +in the file LICENSE in the source distribution or at +L. =cut -- cgit v1.2.3