diff options
author | Sam Roberts <vieuxtech@gmail.com> | 2019-06-12 13:43:44 -0700 |
---|---|---|
committer | Ruben Bridgewater <ruben@bridgewater.de> | 2019-06-17 11:55:44 +0200 |
commit | 4c8fe4a96fddc66a18a33e7d8ae22ea10436ecb8 (patch) | |
tree | 165630be149e639f99070b5e4a5b3ec4fab21920 /deps/openssl/openssl/doc/man1 | |
parent | 5990c4d453b8fc8453a26566bb7ac680a76bd83f (diff) | |
download | android-node-v8-4c8fe4a96fddc66a18a33e7d8ae22ea10436ecb8.tar.gz android-node-v8-4c8fe4a96fddc66a18a33e7d8ae22ea10436ecb8.tar.bz2 android-node-v8-4c8fe4a96fddc66a18a33e7d8ae22ea10436ecb8.zip |
deps: upgrade openssl sources to 1.1.1c
This updates all sources in deps/openssl/openssl by:
$ cd deps/openssl/
$ rm -rf openssl
$ tar zxf ~/tmp/openssl-1.1.1c.tar.gz
$ mv openssl-1.1.1c openssl
$ git add --all openssl
$ git commit openssl
PR-URL: https://github.com/nodejs/node/pull/28211
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'deps/openssl/openssl/doc/man1')
-rw-r--r-- | deps/openssl/openssl/doc/man1/genpkey.pod | 10 | ||||
-rw-r--r-- | deps/openssl/openssl/doc/man1/pkeyutl.pod | 13 | ||||
-rw-r--r-- | deps/openssl/openssl/doc/man1/s_client.pod | 4 | ||||
-rw-r--r-- | deps/openssl/openssl/doc/man1/s_server.pod | 2 | ||||
-rw-r--r-- | deps/openssl/openssl/doc/man1/s_time.pod | 4 | ||||
-rw-r--r-- | deps/openssl/openssl/doc/man1/ts.pod | 7 |
6 files changed, 20 insertions, 20 deletions
diff --git a/deps/openssl/openssl/doc/man1/genpkey.pod b/deps/openssl/openssl/doc/man1/genpkey.pod index 202e531c7e..1ba54d4866 100644 --- a/deps/openssl/openssl/doc/man1/genpkey.pod +++ b/deps/openssl/openssl/doc/man1/genpkey.pod @@ -118,7 +118,7 @@ or ED448 algorithms. =item B<rsa_keygen_bits:numbits> -The number of bits in the generated key. If not specified 1024 is used. +The number of bits in the generated key. If not specified 2048 is used. =item B<rsa_keygen_primes:numprimes> @@ -185,12 +185,12 @@ below. =item B<dsa_paramgen_bits:numbits> -The number of bits in the generated prime. If not specified 1024 is used. +The number of bits in the generated prime. If not specified 2048 is used. =item B<dsa_paramgen_q_bits:numbits> The number of bits in the q parameter. Must be one of 160, 224 or 256. If not -specified 160 is used. +specified 224 is used. =item B<dsa_paramgen_md:digest> @@ -209,7 +209,7 @@ or B<sha256> if it is 256. =item B<dh_paramgen_prime_len:numbits> -The number of bits in the prime parameter B<p>. The default is 1024. +The number of bits in the prime parameter B<p>. The default is 2048. =item B<dh_paramgen_subprime_len:numbits> @@ -325,7 +325,7 @@ The ability to generate X448, ED25519 and ED448 keys was added in OpenSSL 1.1.1. =head1 COPYRIGHT -Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2019 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/doc/man1/pkeyutl.pod b/deps/openssl/openssl/doc/man1/pkeyutl.pod index 664dbef359..dffc449a4e 100644 --- a/deps/openssl/openssl/doc/man1/pkeyutl.pod +++ b/deps/openssl/openssl/doc/man1/pkeyutl.pod @@ -272,20 +272,19 @@ value less than the minimum restriction. =head1 DSA ALGORITHM The DSA algorithm supports signing and verification operations only. Currently -there are no additional options other than B<digest>. Only the SHA1 -digest can be used and this digest is assumed by default. +there are no additional B<-pkeyopt> options other than B<digest>. The SHA1 +digest is assumed by default. =head1 DH ALGORITHM The DH algorithm only supports the derivation operation and no additional -options. +B<-pkeyopt> options. =head1 EC ALGORITHM The EC algorithm supports sign, verify and derive operations. The sign and -verify operations use ECDSA and derive uses ECDH. Currently there are no -additional options other than B<digest>. Only the SHA1 digest can be used and -this digest is assumed by default. +verify operations use ECDSA and derive uses ECDH. SHA1 is assumed by default for +the B<-pkeyopt> B<digest> option. =head1 X25519 and X448 ALGORITHMS @@ -328,7 +327,7 @@ L<EVP_PKEY_CTX_set_hkdf_md(3)>, L<EVP_PKEY_CTX_set_tls1_prf_md(3)> =head1 COPYRIGHT -Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2019 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/doc/man1/s_client.pod b/deps/openssl/openssl/doc/man1/s_client.pod index 55278ac1e7..cf8153572a 100644 --- a/deps/openssl/openssl/doc/man1/s_client.pod +++ b/deps/openssl/openssl/doc/man1/s_client.pod @@ -201,7 +201,7 @@ Even though SNI should normally be a DNS name and not an IP address, if B<-servername> is provided then that name will be sent, regardless of whether it is a DNS name or not. -This option cannot be used in conjuction with B<-noservername>. +This option cannot be used in conjunction with B<-noservername>. =item B<-noservername> @@ -542,7 +542,7 @@ further information). =item B<-bugs> -There are several known bug in SSL and TLS implementations. Adding this +There are several known bugs in SSL and TLS implementations. Adding this option enables various workarounds. =item B<-comp> diff --git a/deps/openssl/openssl/doc/man1/s_server.pod b/deps/openssl/openssl/doc/man1/s_server.pod index c4c014fdc1..768789633e 100644 --- a/deps/openssl/openssl/doc/man1/s_server.pod +++ b/deps/openssl/openssl/doc/man1/s_server.pod @@ -542,7 +542,7 @@ OpenSSL was built. =item B<-bugs> -There are several known bug in SSL and TLS implementations. Adding this +There are several known bugs in SSL and TLS implementations. Adding this option enables various workarounds. =item B<-no_comp> diff --git a/deps/openssl/openssl/doc/man1/s_time.pod b/deps/openssl/openssl/doc/man1/s_time.pod index c08e44a431..ac32f36bc7 100644 --- a/deps/openssl/openssl/doc/man1/s_time.pod +++ b/deps/openssl/openssl/doc/man1/s_time.pod @@ -127,7 +127,7 @@ OpenSSL was built. =item B<-bugs> -There are several known bug in SSL and TLS implementations. Adding this +There are several known bugs in SSL and TLS implementations. Adding this option enables various workarounds. =item B<-cipher cipherlist> @@ -202,7 +202,7 @@ L<s_client(1)>, L<s_server(1)>, L<ciphers(1)> =head1 COPYRIGHT -Copyright 2004-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2004-2019 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy diff --git a/deps/openssl/openssl/doc/man1/ts.pod b/deps/openssl/openssl/doc/man1/ts.pod index eeccaf674c..ec57ec7ebb 100644 --- a/deps/openssl/openssl/doc/man1/ts.pod +++ b/deps/openssl/openssl/doc/man1/ts.pod @@ -262,7 +262,7 @@ specified, the argument is given to the engine as a key identifier. =item B<-I<digest>> Signing digest to use. Overrides the B<signer_digest> config file -option. (Optional) +option. (Mandatory unless specified in the config file) =item B<-chain> certs_file.pem @@ -460,7 +460,8 @@ command line option. (Optional) =item B<signer_digest> Signing digest to use. The same as the -B<-I<digest>> command line option. (Optional) +B<-I<digest>> command line option. (Mandatory unless specified on the command +line) =item B<default_policy> @@ -664,7 +665,7 @@ L<config(5)> =head1 COPYRIGHT -Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved. +Copyright 2006-2019 The OpenSSL Project Authors. All Rights Reserved. Licensed under the OpenSSL license (the "License"). You may not use this file except in compliance with the License. You can obtain a copy |