| OLD | NEW |
|---|
| 1 #ifndef HEADER_OPENSSLV_H | 1 #ifndef HEADER_OPENSSLV_H |
| 2 #define HEADER_OPENSSLV_H | 2 #define HEADER_OPENSSLV_H |
| 3 | 3 |
| 4 /* Numeric release version identifier: | 4 /* Numeric release version identifier: |
| 5 * MNNFFPPS: major minor fix patch status | 5 * MNNFFPPS: major minor fix patch status |
| 6 * The status nibble has one of the values 0 for development, 1 to e for betas | 6 * The status nibble has one of the values 0 for development, 1 to e for betas |
| 7 * 1 to 14, and f for release. The patch level is exactly that. | 7 * 1 to 14, and f for release. The patch level is exactly that. |
| 8 * For example: | 8 * For example: |
| 9 * 0.9.3-dev 0x00903000 | 9 * 0.9.3-dev 0x00903000 |
| 10 * 0.9.3-beta1 0x00903001 | 10 * 0.9.3-beta1 0x00903001 |
| 11 * 0.9.3-beta2-dev 0x00903002 | 11 * 0.9.3-beta2-dev 0x00903002 |
| 12 * 0.9.3-beta2 0x00903002 (same as ...beta2-dev) | 12 * 0.9.3-beta2 0x00903002 (same as ...beta2-dev) |
| 13 * 0.9.3 0x0090300f | 13 * 0.9.3 0x0090300f |
| 14 * 0.9.3a 0x0090301f | 14 * 0.9.3a 0x0090301f |
| 15 * 0.9.4» 0x0090400f | 15 * 0.9.4 » 0x0090400f |
| 16 * 1.2.3z 0x102031af | 16 * 1.2.3z 0x102031af |
| 17 * | 17 * |
| 18 * For continuity reasons (because 0.9.5 is already out, and is coded | 18 * For continuity reasons (because 0.9.5 is already out, and is coded |
| 19 * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level | 19 * 0x00905100), between 0.9.5 and 0.9.6 the coding of the patch level |
| 20 * part is slightly different, by setting the highest bit. This means | 20 * part is slightly different, by setting the highest bit. This means |
| 21 * that 0.9.5a looks like this: 0x0090581f. At 0.9.6, we can start | 21 * that 0.9.5a looks like this: 0x0090581f. At 0.9.6, we can start |
| 22 * with 0x0090600S... | 22 * with 0x0090600S... |
| 23 * | 23 * |
| 24 * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.) | 24 * (Prior to 0.9.3-dev a different scheme was used: 0.9.2b is 0x0922.) |
| 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» 0x009080ffL | 28 #define OPENSSL_VERSION_NUMBER» 0x1000006fL |
| 29 #ifdef OPENSSL_FIPS | 29 #ifdef OPENSSL_FIPS |
| 30 #define OPENSSL_VERSION_TEXT» "OpenSSL 0.9.8o-fips 01 Jun 2010" | 30 #define OPENSSL_VERSION_TEXT» "OpenSSL 1.0.0f-fips 4 Jan 2012" |
| 31 #else | 31 #else |
| 32 #define OPENSSL_VERSION_TEXT» "OpenSSL 0.9.8o 01 Jun 2010" | 32 #define OPENSSL_VERSION_TEXT» "OpenSSL 1.0.0f 4 Jan 2012" |
| 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 |
| 36 | 36 |
| 37 /* The macros below are to be used for shared library (.so, .dll, ...) | 37 /* The macros below are to be used for shared library (.so, .dll, ...) |
| 38 * versioning. That kind of versioning works a bit differently between | 38 * versioning. That kind of versioning works a bit differently between |
| 39 * operating systems. The most usual scheme is to set a major and a minor | 39 * operating systems. The most usual scheme is to set a major and a minor |
| 40 * number, and have the runtime loader check that the major number is equal | 40 * number, and have the runtime loader check that the major number is equal |
| 41 * to what it was at application link time, while the minor number has to | 41 * to what it was at application link time, while the minor number has to |
| 42 * be greater or equal to what it was at application link time. With this | 42 * be greater or equal to what it was at application link time. With this |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 * number doesn't need at all to match the overall OpenSSL version. | 76 * number doesn't need at all to match the overall OpenSSL version. |
| 77 * However, it's nice and more understandable if it actually does. | 77 * However, it's nice and more understandable if it actually does. |
| 78 * The current library version is stored in the macro SHLIB_VERSION_NUMBER, | 78 * The current library version is stored in the macro SHLIB_VERSION_NUMBER, |
| 79 * which is just a piece of text in the format "M.m.e" (Major, minor, edit). | 79 * which is just a piece of text in the format "M.m.e" (Major, minor, edit). |
| 80 * For the sake of Tru64, IRIX, and any other OS that behaves in similar ways, | 80 * For the sake of Tru64, IRIX, and any other OS that behaves in similar ways, |
| 81 * we need to keep a history of version numbers, which is done in the | 81 * we need to keep a history of version numbers, which is done in the |
| 82 * macro SHLIB_VERSION_HISTORY. The numbers are separated by colons and | 82 * macro SHLIB_VERSION_HISTORY. The numbers are separated by colons and |
| 83 * should only keep the versions that are binary compatible with the current. | 83 * should only keep the versions that are binary compatible with the current. |
| 84 */ | 84 */ |
| 85 #define SHLIB_VERSION_HISTORY "" | 85 #define SHLIB_VERSION_HISTORY "" |
| 86 #define SHLIB_VERSION_NUMBER "0.9.8" | 86 #define SHLIB_VERSION_NUMBER "1.0.0" |
| 87 | 87 |
| 88 | 88 |
| 89 #endif /* HEADER_OPENSSLV_H */ | 89 #endif /* HEADER_OPENSSLV_H */ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 9254031:
Upgrade chrome's OpenSSL to same version Android ships with. (Closed)
Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/