diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
| commit | 426a154a830ca2d9bae74612741ff86332f5c66e (patch) | |
| tree | 7937e26cb4336f7a8bfd41a8238859a89e83e4b3 /lib/libcrypto/opensslv.h | |
| parent | 1ab62f029308adf86f7a805afd722d5170be8c34 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/opensslv.h')
| -rw-r--r-- | lib/libcrypto/opensslv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libcrypto/opensslv.h b/lib/libcrypto/opensslv.h index d6d61a0c7d4..71be3590af4 100644 --- a/lib/libcrypto/opensslv.h +++ b/lib/libcrypto/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 0x1000006fL +#define OPENSSL_VERSION_NUMBER 0x1000103fL #ifdef OPENSSL_FIPS -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0f-fips 4 Jan 2012" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1c-fips 10 May 2012" #else -#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.0f 4 Jan 2012" +#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1c 10 May 2012" #endif #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT |