summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbcook <bcook@openbsd.org>2015-07-16 22:36:50 +0000
committerbcook <bcook@openbsd.org>2015-07-16 22:36:50 +0000
commit7ca7bbd1a5b3d36dff178741b07972ae67fafa10 (patch)
tree6a8c2c1ae879e54c6862e2864036fdc12b3cedac
parentAllow (almost) any non-space character to be a part of "word" in doas.conf. (diff)
downloadwireguard-openbsd-7ca7bbd1a5b3d36dff178741b07972ae67fafa10.tar.xz
wireguard-openbsd-7ca7bbd1a5b3d36dff178741b07972ae67fafa10.zip
Bump LIBRESSL_VERSION defines.
Moving forward, software should expect that LIBRESSL_VERSION_TEXT and LIBRESSL_VERSION_NUMBER will increment for each LibreSSL-portable release. ok deraadt@, beck@
-rw-r--r--lib/libcrypto/opensslv.h10
-rw-r--r--lib/libssl/src/crypto/opensslv.h10
2 files changed, 14 insertions, 6 deletions
diff --git a/lib/libcrypto/opensslv.h b/lib/libcrypto/opensslv.h
index acd81bf7fb4..574b6835454 100644
--- a/lib/libcrypto/opensslv.h
+++ b/lib/libcrypto/opensslv.h
@@ -1,10 +1,14 @@
-/* $OpenBSD: opensslv.h,v 1.29 2015/05/23 21:09:46 bcook Exp $ */
+/* $OpenBSD: opensslv.h,v 1.30 2015/07/16 22:36:50 bcook Exp $ */
#ifndef HEADER_OPENSSLV_H
#define HEADER_OPENSSLV_H
-#define LIBRESSL_VERSION_NUMBER 0x20000000L
+/* These will change with each release of LibreSSL-portable */
+#define LIBRESSL_VERSION_NUMBER 0x20020002L
+#define LIBRESSL_VERSION_TEXT "LibreSSL 2.2.2"
+
+/* These will never change */
#define OPENSSL_VERSION_NUMBER 0x20000000L
-#define OPENSSL_VERSION_TEXT "LibreSSL 2.2"
+#define OPENSSL_VERSION_TEXT LIBRESSL_VERSION_TEXT
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
#define SHLIB_VERSION_HISTORY ""
diff --git a/lib/libssl/src/crypto/opensslv.h b/lib/libssl/src/crypto/opensslv.h
index acd81bf7fb4..574b6835454 100644
--- a/lib/libssl/src/crypto/opensslv.h
+++ b/lib/libssl/src/crypto/opensslv.h
@@ -1,10 +1,14 @@
-/* $OpenBSD: opensslv.h,v 1.29 2015/05/23 21:09:46 bcook Exp $ */
+/* $OpenBSD: opensslv.h,v 1.30 2015/07/16 22:36:50 bcook Exp $ */
#ifndef HEADER_OPENSSLV_H
#define HEADER_OPENSSLV_H
-#define LIBRESSL_VERSION_NUMBER 0x20000000L
+/* These will change with each release of LibreSSL-portable */
+#define LIBRESSL_VERSION_NUMBER 0x20020002L
+#define LIBRESSL_VERSION_TEXT "LibreSSL 2.2.2"
+
+/* These will never change */
#define OPENSSL_VERSION_NUMBER 0x20000000L
-#define OPENSSL_VERSION_TEXT "LibreSSL 2.2"
+#define OPENSSL_VERSION_TEXT LIBRESSL_VERSION_TEXT
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
#define SHLIB_VERSION_HISTORY ""