diff options
author | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2019-09-18 11:44:24 +0200 |
---|---|---|
committer | Krzysztof Jackiewicz <k.jackiewicz@samsung.com> | 2019-09-18 12:17:16 +0200 |
commit | c68cb02a89bc062c6b99af42d69cbb749240cf65 (patch) | |
tree | 8af455c91e5e221020fbbbd280be5e829cacb78b /crypto/opensslv.h | |
parent | a47da67cfe68e4a7b1c0b546bdcf71004ba703b1 (diff) | |
parent | 7e25cb9bea3993135aa8154a98032fd30fc16e1c (diff) | |
download | openssl-submit/tizen_base/20191001.092458.tar.gz openssl-submit/tizen_base/20191001.092458.tar.bz2 openssl-submit/tizen_base/20191001.092458.zip |
Merge branch 'upstream' into tizen_basetizen_5.5.m2_releasesubmit/tizen_base/20191001.092458submit/tizen_5.5_base_mobile_hotfix/20201023.171501submit/tizen_5.5_base/20191030.000001accepted/tizen/base/20191008.101335accepted/tizen/5.5/base/mobile/hotfix/20201023.085356accepted/tizen/5.5/base/20191030.083643tizen_5.5_tvtizen_5.5_base_mobile_hotfixaccepted/tizen_5.5_base_mobile_hotfix
Change-Id: I052187c6bd9cc55d587fd63c000608ead364e629
Diffstat (limited to 'crypto/opensslv.h')
-rw-r--r-- | crypto/opensslv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/opensslv.h b/crypto/opensslv.h index 8b47569..488e2bc 100644 --- a/crypto/opensslv.h +++ b/crypto/opensslv.h @@ -30,11 +30,11 @@ 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 0x1000213fL +# define OPENSSL_VERSION_NUMBER 0x1000214fL # ifdef OPENSSL_FIPS -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2s-fips 28 May 2019" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2t-fips 10 Sep 2019" # else -# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2s 28 May 2019" +# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2t 10 Sep 2019" # endif # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT |