diff options
| author | djm <> | 2009-04-06 06:33:20 +0000 |
|---|---|---|
| committer | djm <> | 2009-04-06 06:33:20 +0000 |
| commit | ee26f086217016f09154412b171ad62a33a346f6 (patch) | |
| tree | 647f179fa8dcccf50c436cc0165a1d67476a936e /src/lib/libcrypto/opensslv.h | |
| parent | f929570d17be2469dc7104fcdf26fdaddf3dbb65 (diff) | |
| download | openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.gz openbsd-ee26f086217016f09154412b171ad62a33a346f6.tar.bz2 openbsd-ee26f086217016f09154412b171ad62a33a346f6.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/opensslv.h')
| -rw-r--r-- | src/lib/libcrypto/opensslv.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/opensslv.h b/src/lib/libcrypto/opensslv.h index 09687b5136..c6207f76b2 100644 --- a/src/lib/libcrypto/opensslv.h +++ b/src/lib/libcrypto/opensslv.h | |||
| @@ -25,11 +25,11 @@ | |||
| 25 | * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for | 25 | * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for |
| 26 | * major minor fix final patch/beta) | 26 | * major minor fix final patch/beta) |
| 27 | */ | 27 | */ |
| 28 | #define OPENSSL_VERSION_NUMBER 0x009080afL | 28 | #define OPENSSL_VERSION_NUMBER 0x009080bfL |
| 29 | #ifdef OPENSSL_FIPS | 29 | #ifdef OPENSSL_FIPS |
| 30 | #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8j-fips 07 Jan 2009" | 30 | #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8k-fips 25 Mar 2009" |
| 31 | #else | 31 | #else |
| 32 | #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8j 07 Jan 2009" | 32 | #define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8k 25 Mar 2009" |
| 33 | #endif | 33 | #endif |
| 34 | #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT | 34 | #define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT |
| 35 | 35 | ||