diff options
author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-03-29 16:39:12 +0900 |
---|---|---|
committer | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-04-10 06:45:42 +0900 |
commit | 66cb29e64621fdd1aa5e377a395ff107d21a613b (patch) | |
tree | f05243a51577e04b6f1c4a2f8a6b7b2f05786079 /deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod | |
parent | 38c97f5dc7ff3fbf83982d0268fc9e93cfc00c7d (diff) | |
download | android-node-v8-66cb29e64621fdd1aa5e377a395ff107d21a613b.tar.gz android-node-v8-66cb29e64621fdd1aa5e377a395ff107d21a613b.tar.bz2 android-node-v8-66cb29e64621fdd1aa5e377a395ff107d21a613b.zip |
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 <jasnell@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod')
-rw-r--r-- | deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod b/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod index f7ca7cb790..f50faec772 100644 --- a/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod +++ b/deps/openssl/openssl/doc/crypto/OPENSSL_VERSION_NUMBER.pod @@ -2,7 +2,8 @@ =head1 NAME -OPENSSL_VERSION_NUMBER, SSLeay, SSLeay_version - get OpenSSL version number +OPENSSL_VERSION_NUMBER, OpenSSL_version, +OpenSSL_version_num - get OpenSSL version number =head1 SYNOPSIS @@ -10,8 +11,9 @@ OPENSSL_VERSION_NUMBER, SSLeay, SSLeay_version - get OpenSSL version number #define OPENSSL_VERSION_NUMBER 0xnnnnnnnnnL #include <openssl/crypto.h> - long SSLeay(void); - const char *SSLeay_version(int t); + + unsigned long OpenSSL_version_num(); + const char *OpenSSL_version(int t); =head1 DESCRIPTION @@ -43,43 +45,48 @@ Version 0.9.5a had an interim interpretation that is like the current one, except the patch level got the highest bit set, to keep continuity. The number was therefore 0x0090581f. +OpenSSL_version_num() returns the version number. -For backward compatibility, SSLEAY_VERSION_NUMBER is also defined. - -SSLeay() returns this number. The return value can be compared to the -macro to make sure that the correct version of the library has been -loaded, especially when using DLLs on Windows systems. +The macro OPENSSL_VERSION_AT_LEAST(major,minor) can be used at compile +time test if the current version is at least as new as the version provided. +The arguments major, minor and fix correspond to the version information +as given above. -SSLeay_version() returns different strings depending on B<t>: +OpenSSL_version() returns different strings depending on B<t>: =over 4 -=item SSLEAY_VERSION +=item OPENSSL_VERSION The text variant of the version number and the release date. For example, -"OpenSSL 0.9.5a 1 Apr 2000". +"OpenSSL 1.0.1a 15 Oct 2015". -=item SSLEAY_CFLAGS +=item OPENSSL_CFLAGS The compiler flags set for the compilation process in the form "compiler: ..." if available or "compiler: information not available" otherwise. -=item SSLEAY_BUILT_ON +=item OPENSSL_BUILT_ON The date of the build process in the form "built on: ..." if available or "built on: date not available" otherwise. -=item SSLEAY_PLATFORM +=item OPENSSL_PLATFORM The "Configure" target of the library build in the form "platform: ..." if available or "platform: information not available" otherwise. -=item SSLEAY_DIR +=item OPENSSL_DIR The "OPENSSLDIR" setting of the library build in the form "OPENSSLDIR: "..."" if available or "OPENSSLDIR: N/A" otherwise. +=item OPENSSL_ENGINES_DIR + +The "ENGINESDIR" setting of the library build in the form "ENGINESDIR: "..."" +if available or "ENGINESDIR: N/A" otherwise. + =back For an unknown B<t>, the text "not available" is returned. @@ -90,12 +97,15 @@ The version number. =head1 SEE ALSO -L<crypto(3)|crypto(3)> +L<crypto(3)> + +=head1 COPYRIGHT -=head1 HISTORY +Copyright 2000-2018 The OpenSSL Project Authors. All Rights Reserved. -SSLeay() and SSLEAY_VERSION_NUMBER are available in all versions of SSLeay and OpenSSL. -OPENSSL_VERSION_NUMBER is available in all versions of OpenSSL. -B<SSLEAY_DIR> was added in OpenSSL 0.9.7. +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<https://www.openssl.org/source/license.html>. =cut |