projects / packages / nagios-nrpe.git / blame
| Commit | Line | Data |
|---|---|---|
| ed3355ed JR |
1 | Description: Use pre-generated dh.h for reproducible builds. |
| 2 | Author: Bas Couwenberg <sebastic@debian.org> | |
| 3 | Bug-Debian: https://bugs.debian.org/834857 | |
| 4 | Forwarded: not-needed | |
| 5 | ||
| 6 | --- /dev/null | |
| 7 | +++ b/include/dh.h | |
| 8 | @@ -0,0 +1,53 @@ | |
| 9 | +#ifndef HEADER_DH_H | |
| 10 | +# include <openssl/dh.h> | |
| 11 | +#endif | |
| 12 | + | |
| 13 | +DH *get_dh2048() | |
| 14 | +{ | |
| 15 | + static unsigned char dhp_2048[] = { | |
| 16 | + 0xD0, 0x0A, 0x1E, 0x0E, 0x73, 0xE5, 0x51, 0xC3, 0x6C, 0xAA, | |
| 17 | + 0x7F, 0x6B, 0x9C, 0x9D, 0x47, 0x26, 0xAA, 0x25, 0x2B, 0x73, | |
| 18 | + 0xCD, 0x93, 0x94, 0xA2, 0xEA, 0x56, 0x14, 0xD4, 0x42, 0x48, | |
| 19 | + 0x21, 0x61, 0xF9, 0xA1, 0xB7, 0x88, 0xA7, 0xDA, 0x8B, 0xD8, | |
| 20 | + 0xFF, 0x12, 0x8D, 0x50, 0x2D, 0x1D, 0x40, 0xAB, 0xFD, 0x97, | |
| 21 | + 0x89, 0x18, 0x1D, 0x57, 0x69, 0xD3, 0x68, 0xBF, 0x68, 0xA1, | |
| 22 | + 0x20, 0xAD, 0x80, 0xFF, 0xB4, 0xE3, 0xC6, 0xC9, 0x5A, 0x62, | |
| 23 | + 0x23, 0x39, 0x45, 0x79, 0x8D, 0x03, 0x45, 0x55, 0xEB, 0xCA, | |
| 24 | + 0x34, 0x37, 0x44, 0x4B, 0x9C, 0xFF, 0x3B, 0xA7, 0xA4, 0xD3, | |
| 25 | + 0x2A, 0xD6, 0x96, 0x41, 0x6C, 0x58, 0x19, 0x9E, 0x89, 0xD3, | |
| 26 | + 0xB9, 0x36, 0xB0, 0x07, 0xD2, 0x9C, 0xFE, 0xFD, 0x3E, 0x4E, | |
| 27 | + 0x38, 0x71, 0x2C, 0xB2, 0xE8, 0x54, 0x83, 0x8A, 0xFA, 0x57, | |
| 28 | + 0xE2, 0x2B, 0x62, 0xD6, 0x0D, 0x66, 0x01, 0xE2, 0x46, 0xAD, | |
| 29 | + 0x64, 0x5B, 0x57, 0x5C, 0xED, 0x43, 0x97, 0x58, 0xA9, 0x93, | |
| 30 | + 0x4C, 0xCA, 0xAC, 0x4C, 0xB1, 0xBB, 0xD0, 0xDC, 0xF8, 0xEC, | |
| 31 | + 0x4A, 0x5A, 0xBB, 0xF5, 0x44, 0x70, 0x69, 0xC4, 0x51, 0xA8, | |
| 32 | + 0x0D, 0x47, 0x59, 0x19, 0x57, 0x7A, 0x71, 0x3D, 0x65, 0xB7, | |
| 33 | + 0x55, 0x27, 0x87, 0x44, 0xC0, 0x45, 0x87, 0xA7, 0x0B, 0x73, | |
| 34 | + 0x8D, 0x31, 0xFD, 0xE5, 0xA2, 0xDA, 0x99, 0x6D, 0xC0, 0x51, | |
| 35 | + 0xA3, 0x63, 0x73, 0x76, 0x91, 0x38, 0x5C, 0x57, 0x0B, 0x26, | |
| 36 | + 0x08, 0xC1, 0x66, 0x9F, 0x2D, 0xBE, 0x86, 0x44, 0x1B, 0xD2, | |
| 37 | + 0x40, 0x07, 0xB5, 0x7D, 0x15, 0x4A, 0xDA, 0x5F, 0x89, 0xE9, | |
| 38 | + 0xE7, 0x48, 0xDE, 0x0E, 0x3A, 0xA9, 0xF5, 0x60, 0x3C, 0x32, | |
| 39 | + 0x08, 0x40, 0xAF, 0xF0, 0x83, 0x74, 0xB3, 0x97, 0x44, 0x2E, | |
| 40 | + 0x2F, 0xE8, 0x67, 0x70, 0xA2, 0xAC, 0x94, 0xD9, 0x75, 0xBF, | |
| 41 | + 0x4F, 0x75, 0x8B, 0x2A, 0x1B, 0x1B | |
| 42 | + }; | |
| 43 | + static unsigned char dhg_2048[] = { | |
| 44 | + 0x02 | |
| 45 | + }; | |
| 46 | + DH *dh = DH_new(); | |
| 47 | + BIGNUM *dhp_bn, *dhg_bn; | |
| 48 | + | |
| 49 | + if (dh == NULL) | |
| 50 | + return NULL; | |
| 51 | + dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL); | |
| 52 | + dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL); | |
| 53 | + if (dhp_bn == NULL || dhg_bn == NULL | |
| 54 | + || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) { | |
| 55 | + DH_free(dh); | |
| 56 | + BN_free(dhp_bn); | |
| 57 | + BN_free(dhg_bn); | |
| 58 | + return NULL; | |
| 59 | + } | |
| 60 | + return dh; | |
| 61 | +} | |
| 62 | --- a/macros/ax_nagios_get_ssl | |
| 63 | +++ b/macros/ax_nagios_get_ssl | |
| 64 | @@ -288,15 +288,7 @@ if test x$SSL_TYPE != xNONE; then | |
| 65 | # Find the openssl program | |
| 66 | ||
| 67 | if test x$need_dh = xyes; then | |
| 68 | - AC_PATH_PROG(sslbin,openssl,value-if-not-found,$ssl_dir/sbin$PATH_SEPARATOR$ssl_dir/bin$PATH_SEPARATOR$PATH) | |
| 69 | AC_DEFINE(USE_SSL_DH) | |
| 70 | - # Generate DH parameters | |
| 71 | - if test -f "$sslbin"; then | |
| 72 | - echo "" | |
| 73 | - echo "*** Generating DH Parameters for SSL/TLS ***" | |
| 74 | - # awk to strip off meta data at bottom of dhparam output | |
| 75 | - $sslbin dhparam -C 2048 | awk '/^-----/ {exit} {print}' > include/dh.h | |
| 76 | - fi | |
| 77 | fi | |
| 78 | fi | |
| 79 | fi |