summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbcook <>2014-10-14 13:12:35 +0000
committerbcook <>2014-10-14 13:12:35 +0000
commitc423bcddbe67d3706a9bfd0f8c1fbe00c9e7f9ae (patch)
tree48a2804bf0b8a6eaeec96b17b895a5ba635c8fd2
parente96d19d25ff68a3eb7d494fe74e5f49e99cfd041 (diff)
downloadopenbsd-c423bcddbe67d3706a9bfd0f8c1fbe00c9e7f9ae.tar.gz
openbsd-c423bcddbe67d3706a9bfd0f8c1fbe00c9e7f9ae.tar.bz2
openbsd-c423bcddbe67d3706a9bfd0f8c1fbe00c9e7f9ae.zip
Bump libressl version string to 2.1.
This makes 'openssl version' print a string that matches the -portable release number. Thanks to @blakkeim for pointing it out. The version integer is left alone, with the idea of discouraging software from relying on magic numbers for detecting features. Software configuration should do explicit feature tests instead. ok beck@, deraadt@
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/opensslv.h4
-rw-r--r--src/lib/libssl/src/crypto/opensslv.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/opensslv.h b/src/lib/libcrypto/opensslv.h
index 4996768d22..33b2293bbe 100644
--- a/src/lib/libcrypto/opensslv.h
+++ b/src/lib/libcrypto/opensslv.h
@@ -1,10 +1,10 @@
1/* $OpenBSD: opensslv.h,v 1.27 2014/07/11 21:21:59 beck Exp $ */ 1/* $OpenBSD: opensslv.h,v 1.28 2014/10/14 13:12:35 bcook Exp $ */
2#ifndef HEADER_OPENSSLV_H 2#ifndef HEADER_OPENSSLV_H
3#define HEADER_OPENSSLV_H 3#define HEADER_OPENSSLV_H
4 4
5#define LIBRESSL_VERSION_NUMBER 0x20000000L 5#define LIBRESSL_VERSION_NUMBER 0x20000000L
6#define OPENSSL_VERSION_NUMBER 0x20000000L 6#define OPENSSL_VERSION_NUMBER 0x20000000L
7#define OPENSSL_VERSION_TEXT "LibreSSL 2.0" 7#define OPENSSL_VERSION_TEXT "LibreSSL 2.1"
8#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT 8#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
9 9
10#define SHLIB_VERSION_HISTORY "" 10#define SHLIB_VERSION_HISTORY ""
diff --git a/src/lib/libssl/src/crypto/opensslv.h b/src/lib/libssl/src/crypto/opensslv.h
index 4996768d22..33b2293bbe 100644
--- a/src/lib/libssl/src/crypto/opensslv.h
+++ b/src/lib/libssl/src/crypto/opensslv.h
@@ -1,10 +1,10 @@
1/* $OpenBSD: opensslv.h,v 1.27 2014/07/11 21:21:59 beck Exp $ */ 1/* $OpenBSD: opensslv.h,v 1.28 2014/10/14 13:12:35 bcook Exp $ */
2#ifndef HEADER_OPENSSLV_H 2#ifndef HEADER_OPENSSLV_H
3#define HEADER_OPENSSLV_H 3#define HEADER_OPENSSLV_H
4 4
5#define LIBRESSL_VERSION_NUMBER 0x20000000L 5#define LIBRESSL_VERSION_NUMBER 0x20000000L
6#define OPENSSL_VERSION_NUMBER 0x20000000L 6#define OPENSSL_VERSION_NUMBER 0x20000000L
7#define OPENSSL_VERSION_TEXT "LibreSSL 2.0" 7#define OPENSSL_VERSION_TEXT "LibreSSL 2.1"
8#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT 8#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
9 9
10#define SHLIB_VERSION_HISTORY "" 10#define SHLIB_VERSION_HISTORY ""