update to openssl headers from version 1.0.2m

1 files changed, 28 insertions, 27 deletions

diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 216e8f4142..ac7979aa8d 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -1,23 +1,24 @@
 #ifndef HEADER_OPENSSLV_H

-#define HEADER_OPENSSLV_H

+# define HEADER_OPENSSLV_H

 

 #ifdef  __cplusplus

 extern "C" {

 #endif

 

-/* Numeric release version identifier:

+/*-

+ * 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

  * 1 to 14, and f for release.  The patch level is exactly that.

  * For example:

- * 0.9.3-dev	  0x00903000

- * 0.9.3-beta1	  0x00903001

+ * 0.9.3-dev      0x00903000

+ * 0.9.3-beta1    0x00903001

  * 0.9.3-beta2-dev 0x00903002

  * 0.9.3-beta2    0x00903002 (same as ...beta2-dev)

- * 0.9.3	  0x0090300f

- * 0.9.3a	  0x0090301f

- * 0.9.4 	  0x0090400f

- * 1.2.3z	  0x102031af

+ * 0.9.3          0x0090300f

+ * 0.9.3a         0x0090301f

+ * 0.9.4          0x0090400f

+ * 1.2.3z         0x102031af

  *

  * For continuity reasons (because 0.9.5 is already out, and is coded

  * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level

@@ -29,16 +30,16 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for

  *  major minor fix final patch/beta)

  */

-#define OPENSSL_VERSION_NUMBER	0x100010afL

-#ifdef OPENSSL_FIPS

-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1j-fips 15 Oct 2014"

-#else

-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1j 15 Oct 2014"

-#endif

-#define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT

-

+# define OPENSSL_VERSION_NUMBER  0x100020e0L

+# ifdef OPENSSL_FIPS

+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2n-fips-dev  xx XXX xxxx"

+# else

+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2n-dev  xx XXX xxxx"

+# endif

+# define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT

 

-/* The macros below are to be used for shared library (.so, .dll, ...)

+/*-

+ * The macros below are to be used for shared library (.so, .dll, ...)

  * versioning.  That kind of versioning works a bit differently between

  * operating systems.  The most usual scheme is to set a major and a minor

  * number, and have the runtime loader check that the major number is equal

@@ -46,11 +47,11 @@ extern "C" {
  * be greater or equal to what it was at application link time.  With this

  * scheme, the version number is usually part of the file name, like this:

  *

- *	libcrypto.so.0.9

+ *      libcrypto.so.0.9

  *

  * Some unixen also make a softlink with the major verson number only:

  *

- *	libcrypto.so.0

+ *      libcrypto.so.0

  *

  * On Tru64 and IRIX 6.x it works a little bit differently.  There, the

  * shared library version is stored in the file, and is actually a series

@@ -65,11 +66,11 @@ extern "C" {
  * to highest, should be part of the string.  Consecutive builds would

  * give the following versions strings:

  *

- *	3.0

- *	3.0:3.1

- *	3.0:3.1:3.2

- *	4.0

- *	4.0:4.1

+ *      3.0

+ *      3.0:3.1

+ *      3.0:3.1:3.2

+ *      4.0

+ *      4.0:4.1

  *

  * Notice how version 4 is completely incompatible with version, and

  * therefore give the breach you can see.

@@ -86,11 +87,11 @@ extern "C" {
  * macro SHLIB_VERSION_HISTORY.  The numbers are separated by colons and

  * should only keep the versions that are binary compatible with the current.

  */

-#define SHLIB_VERSION_HISTORY ""

-#define SHLIB_VERSION_NUMBER "1.0.0"

+# define SHLIB_VERSION_HISTORY ""

+# define SHLIB_VERSION_NUMBER "1.0.0"

 

 

 #ifdef  __cplusplus

 }

 #endif

-#endif /* HEADER_OPENSSLV_H */

+#endif                          /* HEADER_OPENSSLV_H */