diff options
| author | Gary Lin <glin@suse.com> | 2017-04-06 15:54:00 +0800 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2017-04-11 10:42:18 -0400 |
| commit | d064bd7eef201f26cb926450a76260b5187ac689 (patch) | |
| tree | 31e32f58f8c5b17b57e674d40a585d119857d21b /Cryptlib/Include/openssl/opensslv.h | |
| parent | 9bc86cfd6f9387f0da9d5c0102b6aa5627e91c91 (diff) | |
| download | efi-boot-shim-d064bd7eef201f26cb926450a76260b5187ac689.tar.gz efi-boot-shim-d064bd7eef201f26cb926450a76260b5187ac689.zip | |
Cryptlib: Update to the latest edk2 commit
- Update to edk2 commit 7c410b3d4180087020c7734bf67cdc4ad9fdb136
CryptoPkg/BaseCryptLib: Adding NULL checking in time() wrapper.
- Update headers in Cryptlib/Include/openssl/ to 1.1.0e
+ Also copy the openssl internal headers
Signed-off-by: Gary Lin <glin@suse.com>
Diffstat (limited to 'Cryptlib/Include/openssl/opensslv.h')
| -rw-r--r-- | Cryptlib/Include/openssl/opensslv.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/Cryptlib/Include/openssl/opensslv.h b/Cryptlib/Include/openssl/opensslv.h index 645dd079..9d6708fa 100644 --- a/Cryptlib/Include/openssl/opensslv.h +++ b/Cryptlib/Include/openssl/opensslv.h @@ -1,3 +1,12 @@ +/* + * Copyright 1999-2016 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 + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + #ifndef HEADER_OPENSSLV_H # define HEADER_OPENSSLV_H @@ -30,13 +39,12 @@ extern "C" { * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -# define OPENSSL_VERSION_NUMBER 0x100020bfL +# define OPENSSL_VERSION_NUMBER 0x1010005fL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k-fips 26 Jan 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e-fips 16 Feb 2017" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2k 26 Jan 2017" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0e 16 Feb 2017" # endif -# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT /*- * The macros below are to be used for shared library (.so, .dll, ...) @@ -49,7 +57,7 @@ extern "C" { * * libcrypto.so.0.9 * - * Some unixen also make a softlink with the major verson number only: + * Some unixen also make a softlink with the major version number only: * * libcrypto.so.0 * @@ -88,7 +96,7 @@ extern "C" { * should only keep the versions that are binary compatible with the current. */ # define SHLIB_VERSION_HISTORY "" -# define SHLIB_VERSION_NUMBER "1.0.0" +# define SHLIB_VERSION_NUMBER "1.1" #ifdef __cplusplus |