aboutsummaryrefslogtreecommitdiff
path: root/openssl/crypto/opensslv.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-10-19 11:31:33 +0200
committermarha <marha@users.sourceforge.net>2014-10-19 11:33:30 +0200
commita14858a22f164b5accc4bd192a5d3de21d88e3d1 (patch)
tree6a0005fed0f248559139016a7310add07fcb62df /openssl/crypto/opensslv.h
parentfa5a6df66cfe9b19014ea9d2fca35b762f457041 (diff)
downloadvcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.gz
vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.tar.bz2
vcxsrv-a14858a22f164b5accc4bd192a5d3de21d88e3d1.zip
Update to openssl-1.0.1j
Diffstat (limited to 'openssl/crypto/opensslv.h')
-rw-r--r--openssl/crypto/opensslv.h13
1 files changed, 10 insertions, 3 deletions
diff --git a/openssl/crypto/opensslv.h b/openssl/crypto/opensslv.h
index 241150530..f375967ef 100644
--- a/openssl/crypto/opensslv.h
+++ b/openssl/crypto/opensslv.h
@@ -1,6 +1,10 @@
#ifndef HEADER_OPENSSLV_H
#define HEADER_OPENSSLV_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/* Numeric release version identifier:
* MNNFFPPS: major minor fix patch status
* The status nibble has one of the values 0 for development, 1 to e for betas
@@ -25,11 +29,11 @@
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-#define OPENSSL_VERSION_NUMBER 0x1000109fL
+#define OPENSSL_VERSION_NUMBER 0x100010afL
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1i-fips 6 Aug 2014"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1j-fips 15 Oct 2014"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1i 6 Aug 2014"
+#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1j 15 Oct 2014"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
@@ -86,4 +90,7 @@
#define SHLIB_VERSION_NUMBER "1.0.0"
+#ifdef __cplusplus
+}
+#endif
#endif /* HEADER_OPENSSLV_H */