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