0001-fix-openssl-1.0.2.patch 3.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127
  1. From eb471de8f26e0367dd08d299d2252fa8b2b958a9 Mon Sep 17 00:00:00 2001
  2. From: Emilio <emilio.campos@zevenet.com>
  3. Date: Mon, 17 Jul 2017 09:41:32 +0200
  4. Subject: [PATCH] [Improvement] Added support to compile pound with openssl
  5. 1.0.2
  6. Signed-off-by: Emilio <emilio.campos@zevenet.com>
  7. new file: dh2048.h
  8. modified: svc.c
  9. Patch was downloaded from 3rd-party repo:
  10. https://github.com/zevenet/pound/commit/eb471de8f26e0367dd08d299d2252fa8b2b958a9
  11. This repo was announced on upstream mailinglist:
  12. http://www.apsis.ch/pound/pound_list/archive/2017/2017-07/1500287626000#1500287626000
  13. Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
  14. ---
  15. dh2048.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
  16. svc.c | 33 +++++++++++++++++++++++++++++++++
  17. 2 files changed, 86 insertions(+)
  18. create mode 100644 dh2048.h
  19. diff --git a/dh2048.h b/dh2048.h
  20. new file mode 100644
  21. index 0000000..79c693c
  22. --- /dev/null
  23. +++ b/dh2048.h
  24. @@ -0,0 +1,53 @@
  25. +#ifndef HEADER_DH_H
  26. +# include <openssl/dh.h>
  27. +#endif
  28. +
  29. +DH *get_dh2048()
  30. +{
  31. + static unsigned char dhp_2048[] = {
  32. + 0xBF, 0x6C, 0xC6, 0xBD, 0xEA, 0x10, 0x84, 0x59, 0x40, 0xC2,
  33. + 0xC6, 0xA2, 0x9B, 0x19, 0xD3, 0x2E, 0x2F, 0xAB, 0xE6, 0xE4,
  34. + 0x1E, 0x91, 0x0D, 0x59, 0xDC, 0x96, 0x3F, 0x6E, 0x65, 0x38,
  35. + 0xB9, 0xBE, 0xBB, 0x8F, 0xDF, 0x73, 0xAC, 0xAC, 0xB3, 0x2F,
  36. + 0xA7, 0x02, 0x0B, 0x87, 0xB7, 0x3F, 0x3A, 0x42, 0x8A, 0x94,
  37. + 0xDD, 0xEC, 0x33, 0xA4, 0x25, 0xB1, 0xBF, 0x84, 0x91, 0x87,
  38. + 0xD8, 0x1C, 0x42, 0xB9, 0x8E, 0x00, 0x1F, 0x49, 0xED, 0x57,
  39. + 0xA4, 0x48, 0xB0, 0xCC, 0xD8, 0xB8, 0x83, 0xCA, 0x3E, 0xDF,
  40. + 0xA2, 0xF2, 0x07, 0x71, 0x71, 0x18, 0x1F, 0x50, 0x45, 0x3A,
  41. + 0x66, 0x04, 0x7F, 0x15, 0xB2, 0xA8, 0x02, 0x77, 0xCE, 0xC6,
  42. + 0xF9, 0x7C, 0x63, 0xE4, 0x52, 0x41, 0xFA, 0x62, 0xB9, 0x0D,
  43. + 0xDC, 0x08, 0x62, 0xEC, 0x00, 0xAB, 0xB0, 0xF7, 0x79, 0x48,
  44. + 0x75, 0x22, 0x85, 0xCC, 0x67, 0x3C, 0xEA, 0x09, 0x32, 0xAC,
  45. + 0x30, 0xED, 0x1E, 0x67, 0xDC, 0x74, 0xF8, 0xD9, 0xC3, 0xD0,
  46. + 0xA0, 0x60, 0x4D, 0xCE, 0x52, 0xBC, 0xA3, 0xE5, 0x18, 0x7B,
  47. + 0x0B, 0xC8, 0xCE, 0x70, 0xA2, 0xC8, 0x21, 0xCA, 0xCE, 0xA5,
  48. + 0xD4, 0xCB, 0x85, 0xFC, 0xC7, 0x07, 0x5C, 0x05, 0x87, 0xFC,
  49. + 0x2F, 0x67, 0x4D, 0x2D, 0x4F, 0xA4, 0xEE, 0x63, 0x98, 0x49,
  50. + 0xE4, 0x2E, 0xD7, 0x3F, 0x7D, 0x69, 0x68, 0x0A, 0xA2, 0x3E,
  51. + 0x5A, 0x04, 0xD4, 0xDD, 0xBB, 0xC7, 0xB4, 0x34, 0xB7, 0x21,
  52. + 0xD3, 0xAC, 0x99, 0xD7, 0x87, 0x45, 0x5E, 0x18, 0x68, 0x16,
  53. + 0x3A, 0xAF, 0xE2, 0x04, 0x57, 0xB8, 0x6A, 0xB8, 0x2F, 0x75,
  54. + 0xD5, 0x79, 0x96, 0x60, 0x8D, 0xD1, 0xCC, 0xD1, 0x33, 0x85,
  55. + 0x53, 0x88, 0x87, 0x34, 0xA6, 0x4B, 0x49, 0x24, 0x53, 0xD6,
  56. + 0xF1, 0x1E, 0x4E, 0x98, 0x4D, 0x6B, 0x44, 0x31, 0x94, 0xFF,
  57. + 0x46, 0xC2, 0x38, 0x2E, 0xEA, 0xBB
  58. + };
  59. + static unsigned char dhg_2048[] = {
  60. + 0x05
  61. + };
  62. + DH *dh = DH_new();
  63. + BIGNUM *dhp_bn, *dhg_bn;
  64. +
  65. + if (dh == NULL)
  66. + return NULL;
  67. + dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL);
  68. + dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL);
  69. + if (dhp_bn == NULL || dhg_bn == NULL
  70. + || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) {
  71. + DH_free(dh);
  72. + BN_free(dhp_bn);
  73. + BN_free(dhg_bn);
  74. + return NULL;
  75. + }
  76. + return dh;
  77. +}
  78. diff --git a/svc.c b/svc.c
  79. index 1341397..758dfbd 100644
  80. --- a/svc.c
  81. +++ b/svc.c
  82. @@ -1512,6 +1512,39 @@ do_RSAgen(void)
  83. return;
  84. }
  85. +
  86. +#if OPENSSL_VERSION_NUMBER < 0x10100000
  87. +static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
  88. +{
  89. + /* If the fields p and g in d are NULL, the corresponding input
  90. + * parameters MUST be non-NULL. q may remain NULL.
  91. + */
  92. + if ((dh->p == NULL && p == NULL)
  93. + || (dh->g == NULL && g == NULL))
  94. + return 0;
  95. +
  96. + if (p != NULL) {
  97. + BN_free(dh->p);
  98. + dh->p = p;
  99. + }
  100. + if (q != NULL) {
  101. + BN_free(dh->q);
  102. + dh->q = q;
  103. + }
  104. + if (g != NULL) {
  105. + BN_free(dh->g);
  106. + dh->g = g;
  107. + }
  108. +
  109. + if (q != NULL) {
  110. + dh->length = BN_num_bits(q);
  111. + }
  112. +
  113. + return 1;
  114. +}
  115. +#endif
  116. +
  117. +
  118. #include "dh512.h"
  119. #if DH_LEN == 1024