diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-27 20:34:07 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-27 20:34:07 +0100 |
| commit | 829194c926fa1e3bd45e4fe740e0bc42efe6ace6 (patch) | |
| tree | 6b4b6de1185b25f8e6071b3204fcb69762bdc0ac /openssl/crypto/opensslv.h | |
| parent | 40bdd8b27f5c730b8d0c9a189e89fb51a5400611 (diff) | |
| parent | c6a1477b0092762299491d79b3a8cb094c6456da (diff) | |
| download | vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.tar.gz vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.tar.bz2 vcxsrv-829194c926fa1e3bd45e4fe740e0bc42efe6ace6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/crypto/opensslv.h')
| -rw-r--r-- | openssl/crypto/opensslv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/openssl/crypto/opensslv.h b/openssl/crypto/opensslv.h index 310a3387b..a368f6fc7 100644 --- a/openssl/crypto/opensslv.h +++ b/openssl/crypto/opensslv.h @@ -25,11 +25,11 @@ * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * major minor fix final patch/beta) */ -#define OPENSSL_VERSION_NUMBER 0x1000005fL +#define OPENSSL_VERSION_NUMBER 0x1000007fL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0e-fips 6 Sep 2011" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0g-fips 18 Jan 2012" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0e 6 Sep 2011" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0g 18 Jan 2012" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT |