1diff --git a/build-aux/automake.mk b/build-aux/automake.mk
2new file mode 100644
3index 000000000..5d2657fd6
4--- /dev/null
5+++ b/build-aux/automake.mk
6@@ -0,0 +1,2 @@
7+EXTRA_DIST += \
8+ build-aux/generate-dhparams-c
9diff --git a/build-aux/generate-dhparams-c b/build-aux/generate-dhparams-c
10new file mode 100755
11index 000000000..bcd25e2d8
12--- /dev/null
13+++ b/build-aux/generate-dhparams-c
14@@ -0,0 +1,33 @@
15+#! /bin/sh -e
16+
17+cat <<'EOF'
18+/* Generated automatically; do not modify! -*- buffer-read-only: t -*-
19+ *
20+ * If you do need to regenerate this file, run "make generate-dhparams-c". */
21+
22+#include <config.h>
23+#include "lib/dhparams.h"
24+#include "lib/util.h"
25+
26+static int
27+my_DH_set0_pqg(DH *dh, BIGNUM *p, const BIGNUM **q OVS_UNUSED, BIGNUM *g)
28+{
29+ ovs_assert(q == NULL);
30+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
31+ dh->p = p;
32+ dh->g = g;
33+ return 1;
34+#else
35+ return DH_set0_pqg(dh, p, NULL, g);
36+#endif
37+}
38+EOF
39+(openssl dhparam -C -in lib/dh1024.pem -noout &&
40+openssl dhparam -C -in lib/dh2048.pem -noout &&
41+openssl dhparam -C -in lib/dh4096.pem -noout) | sed '
42+ s/^static DH/DH/
43+ s/\(get_dh[0-9]*\)()/\1(void)/
44+ s/\(DH_set0_pqg\)/my_\1/
45+ s/[ ]*$//
46+ s/ / /g
47+'
48diff --git a/lib/automake.mk b/lib/automake.mk
49index 5387d519a..804a8b7d7 100644
50--- a/lib/automake.mk
51+++ b/lib/automake.mk
52@@ -399,15 +399,16 @@ lib_libopenvswitch_la_SOURCES += \
53 lib/route-table-bsd.c
54 endif
55
56+.PHONY: generate-dhparams-c
57 if HAVE_OPENSSL
58-lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c
59-nodist_lib_libopenvswitch_la_SOURCES += lib/dhparams.c
60-lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem
61- $(AM_V_GEN)(echo '#include "lib/dhparams.h"' && \
62- openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout && \
63- openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout && \
64- openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) \
65- | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp && \
66+lib_libopenvswitch_la_SOURCES += lib/stream-ssl.c lib/dhparams.c
67+
68+# Manually regenerates lib/dhparams.c. Not normally necessary since
69+# lib/dhparams.c is part of the repository and doesn't normally need
70+# updates.
71+generate-dhparams-c:
72+ $(AM_V_GEN)cd $(srcdir) && \
73+ build-aux/generate-dhparams-c > lib/dhparams.c.tmp && \
74 mv lib/dhparams.c.tmp lib/dhparams.c
75 else
76 lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c
77diff --git a/lib/dhparams.c b/lib/dhparams.c
78new file mode 100644
79index 000000000..4e42efad2
80--- /dev/null
81+++ b/lib/dhparams.c
82@@ -0,0 +1,192 @@
83+/* Generated automatically; do not modify! -*- buffer-read-only: t -*-
84+ *
85+ * If you do need to regenerate this file, run "make generate-dhparams-c". */
86+
87+#include <config.h>
88+#include "lib/dhparams.h"
89+#include "lib/util.h"
90+
91+static int
92+my_DH_set0_pqg(DH *dh, BIGNUM *p, const BIGNUM **q OVS_UNUSED, BIGNUM *g)
93+{
94+ ovs_assert(q == NULL);
95+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined (LIBRESSL_VERSION_NUMBER)
96+ dh->p = p;
97+ dh->g = g;
98+ return 1;
99+#else
100+ return DH_set0_pqg(dh, p, NULL, g);
101+#endif
102+}
103+#ifndef HEADER_DH_H
104+# include <openssl/dh.h>
105+#endif
106+
107+DH *get_dh1024(void)
108+{
109+ static unsigned char dhp_1024[] = {
110+ 0xF4, 0x88, 0xFD, 0x58, 0x4E, 0x49, 0xDB, 0xCD, 0x20, 0xB4,
111+ 0x9D, 0xE4, 0x91, 0x07, 0x36, 0x6B, 0x33, 0x6C, 0x38, 0x0D,
112+ 0x45, 0x1D, 0x0F, 0x7C, 0x88, 0xB3, 0x1C, 0x7C, 0x5B, 0x2D,
113+ 0x8E, 0xF6, 0xF3, 0xC9, 0x23, 0xC0, 0x43, 0xF0, 0xA5, 0x5B,
114+ 0x18, 0x8D, 0x8E, 0xBB, 0x55, 0x8C, 0xB8, 0x5D, 0x38, 0xD3,
115+ 0x34, 0xFD, 0x7C, 0x17, 0x57, 0x43, 0xA3, 0x1D, 0x18, 0x6C,
116+ 0xDE, 0x33, 0x21, 0x2C, 0xB5, 0x2A, 0xFF, 0x3C, 0xE1, 0xB1,
117+ 0x29, 0x40, 0x18, 0x11, 0x8D, 0x7C, 0x84, 0xA7, 0x0A, 0x72,
118+ 0xD6, 0x86, 0xC4, 0x03, 0x19, 0xC8, 0x07, 0x29, 0x7A, 0xCA,
119+ 0x95, 0x0C, 0xD9, 0x96, 0x9F, 0xAB, 0xD0, 0x0A, 0x50, 0x9B,
120+ 0x02, 0x46, 0xD3, 0x08, 0x3D, 0x66, 0xA4, 0x5D, 0x41, 0x9F,
121+ 0x9C, 0x7C, 0xBD, 0x89, 0x4B, 0x22, 0x19, 0x26, 0xBA, 0xAB,
122+ 0xA2, 0x5E, 0xC3, 0x55, 0xE9, 0x2F, 0x78, 0xC7
123+ };
124+ static unsigned char dhg_1024[] = {
125+ 0x02
126+ };
127+ DH *dh = DH_new();
128+ BIGNUM *dhp_bn, *dhg_bn;
129+
130+ if (dh == NULL)
131+ return NULL;
132+ dhp_bn = BN_bin2bn(dhp_1024, sizeof (dhp_1024), NULL);
133+ dhg_bn = BN_bin2bn(dhg_1024, sizeof (dhg_1024), NULL);
134+ if (dhp_bn == NULL || dhg_bn == NULL
135+ || !my_DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) {
136+ DH_free(dh);
137+ BN_free(dhp_bn);
138+ BN_free(dhg_bn);
139+ return NULL;
140+ }
141+ return dh;
142+}
143+#ifndef HEADER_DH_H
144+# include <openssl/dh.h>
145+#endif
146+
147+DH *get_dh2048(void)
148+{
149+ static unsigned char dhp_2048[] = {
150+ 0xF6, 0x42, 0x57, 0xB7, 0x08, 0x7F, 0x08, 0x17, 0x72, 0xA2,
151+ 0xBA, 0xD6, 0xA9, 0x42, 0xF3, 0x05, 0xE8, 0xF9, 0x53, 0x11,
152+ 0x39, 0x4F, 0xB6, 0xF1, 0x6E, 0xB9, 0x4B, 0x38, 0x20, 0xDA,
153+ 0x01, 0xA7, 0x56, 0xA3, 0x14, 0xE9, 0x8F, 0x40, 0x55, 0xF3,
154+ 0xD0, 0x07, 0xC6, 0xCB, 0x43, 0xA9, 0x94, 0xAD, 0xF7, 0x4C,
155+ 0x64, 0x86, 0x49, 0xF8, 0x0C, 0x83, 0xBD, 0x65, 0xE9, 0x17,
156+ 0xD4, 0xA1, 0xD3, 0x50, 0xF8, 0xF5, 0x59, 0x5F, 0xDC, 0x76,
157+ 0x52, 0x4F, 0x3D, 0x3D, 0x8D, 0xDB, 0xCE, 0x99, 0xE1, 0x57,
158+ 0x92, 0x59, 0xCD, 0xFD, 0xB8, 0xAE, 0x74, 0x4F, 0xC5, 0xFC,
159+ 0x76, 0xBC, 0x83, 0xC5, 0x47, 0x30, 0x61, 0xCE, 0x7C, 0xC9,
160+ 0x66, 0xFF, 0x15, 0xF9, 0xBB, 0xFD, 0x91, 0x5E, 0xC7, 0x01,
161+ 0xAA, 0xD3, 0x5B, 0x9E, 0x8D, 0xA0, 0xA5, 0x72, 0x3A, 0xD4,
162+ 0x1A, 0xF0, 0xBF, 0x46, 0x00, 0x58, 0x2B, 0xE5, 0xF4, 0x88,
163+ 0xFD, 0x58, 0x4E, 0x49, 0xDB, 0xCD, 0x20, 0xB4, 0x9D, 0xE4,
164+ 0x91, 0x07, 0x36, 0x6B, 0x33, 0x6C, 0x38, 0x0D, 0x45, 0x1D,
165+ 0x0F, 0x7C, 0x88, 0xB3, 0x1C, 0x7C, 0x5B, 0x2D, 0x8E, 0xF6,
166+ 0xF3, 0xC9, 0x23, 0xC0, 0x43, 0xF0, 0xA5, 0x5B, 0x18, 0x8D,
167+ 0x8E, 0xBB, 0x55, 0x8C, 0xB8, 0x5D, 0x38, 0xD3, 0x34, 0xFD,
168+ 0x7C, 0x17, 0x57, 0x43, 0xA3, 0x1D, 0x18, 0x6C, 0xDE, 0x33,
169+ 0x21, 0x2C, 0xB5, 0x2A, 0xFF, 0x3C, 0xE1, 0xB1, 0x29, 0x40,
170+ 0x18, 0x11, 0x8D, 0x7C, 0x84, 0xA7, 0x0A, 0x72, 0xD6, 0x86,
171+ 0xC4, 0x03, 0x19, 0xC8, 0x07, 0x29, 0x7A, 0xCA, 0x95, 0x0C,
172+ 0xD9, 0x96, 0x9F, 0xAB, 0xD0, 0x0A, 0x50, 0x9B, 0x02, 0x46,
173+ 0xD3, 0x08, 0x3D, 0x66, 0xA4, 0x5D, 0x41, 0x9F, 0x9C, 0x7C,
174+ 0xBD, 0x89, 0x4B, 0x22, 0x19, 0x26, 0xBA, 0xAB, 0xA2, 0x5E,
175+ 0xC3, 0x55, 0xE9, 0x32, 0x0B, 0x3B
176+ };
177+ static unsigned char dhg_2048[] = {
178+ 0x02
179+ };
180+ DH *dh = DH_new();
181+ BIGNUM *dhp_bn, *dhg_bn;
182+
183+ if (dh == NULL)
184+ return NULL;
185+ dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL);
186+ dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL);
187+ if (dhp_bn == NULL || dhg_bn == NULL
188+ || !my_DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) {
189+ DH_free(dh);
190+ BN_free(dhp_bn);
191+ BN_free(dhg_bn);
192+ return NULL;
193+ }
194+ return dh;
195+}
196+#ifndef HEADER_DH_H
197+# include <openssl/dh.h>
198+#endif
199+
200+DH *get_dh4096(void)
201+{
202+ static unsigned char dhp_4096[] = {
203+ 0xFA, 0x14, 0x72, 0x52, 0xC1, 0x4D, 0xE1, 0x5A, 0x49, 0xD4,
204+ 0xEF, 0x09, 0x2D, 0xC0, 0xA8, 0xFD, 0x55, 0xAB, 0xD7, 0xD9,
205+ 0x37, 0x04, 0x28, 0x09, 0xE2, 0xE9, 0x3E, 0x77, 0xE2, 0xA1,
206+ 0x7A, 0x18, 0xDD, 0x46, 0xA3, 0x43, 0x37, 0x23, 0x90, 0x97,
207+ 0xF3, 0x0E, 0xC9, 0x03, 0x50, 0x7D, 0x65, 0xCF, 0x78, 0x62,
208+ 0xA6, 0x3A, 0x62, 0x22, 0x83, 0xA1, 0x2F, 0xFE, 0x79, 0xBA,
209+ 0x35, 0xFF, 0x59, 0xD8, 0x1D, 0x61, 0xDD, 0x1E, 0x21, 0x13,
210+ 0x17, 0xFE, 0xCD, 0x38, 0x87, 0x9E, 0xF5, 0x4F, 0x79, 0x10,
211+ 0x61, 0x8D, 0xD4, 0x22, 0xF3, 0x5A, 0xED, 0x5D, 0xEA, 0x21,
212+ 0xE9, 0x33, 0x6B, 0x48, 0x12, 0x0A, 0x20, 0x77, 0xD4, 0x25,
213+ 0x60, 0x61, 0xDE, 0xF6, 0xB4, 0x4F, 0x1C, 0x63, 0x40, 0x8B,
214+ 0x3A, 0x21, 0x93, 0x8B, 0x79, 0x53, 0x51, 0x2C, 0xCA, 0xB3,
215+ 0x7B, 0x29, 0x56, 0xA8, 0xC7, 0xF8, 0xF4, 0x7B, 0x08, 0x5E,
216+ 0xA6, 0xDC, 0xA2, 0x45, 0x12, 0x56, 0xDD, 0x41, 0x92, 0xF2,
217+ 0xDD, 0x5B, 0x8F, 0x23, 0xF0, 0xF3, 0xEF, 0xE4, 0x3B, 0x0A,
218+ 0x44, 0xDD, 0xED, 0x96, 0x84, 0xF1, 0xA8, 0x32, 0x46, 0xA3,
219+ 0xDB, 0x4A, 0xBE, 0x3D, 0x45, 0xBA, 0x4E, 0xF8, 0x03, 0xE5,
220+ 0xDD, 0x6B, 0x59, 0x0D, 0x84, 0x1E, 0xCA, 0x16, 0x5A, 0x8C,
221+ 0xC8, 0xDF, 0x7C, 0x54, 0x44, 0xC4, 0x27, 0xA7, 0x3B, 0x2A,
222+ 0x97, 0xCE, 0xA3, 0x7D, 0x26, 0x9C, 0xAD, 0xF4, 0xC2, 0xAC,
223+ 0x37, 0x4B, 0xC3, 0xAD, 0x68, 0x84, 0x7F, 0x99, 0xA6, 0x17,
224+ 0xEF, 0x6B, 0x46, 0x3A, 0x7A, 0x36, 0x7A, 0x11, 0x43, 0x92,
225+ 0xAD, 0xE9, 0x9C, 0xFB, 0x44, 0x6C, 0x3D, 0x82, 0x49, 0xCC,
226+ 0x5C, 0x6A, 0x52, 0x42, 0xF8, 0x42, 0xFB, 0x44, 0xF9, 0x39,
227+ 0x73, 0xFB, 0x60, 0x79, 0x3B, 0xC2, 0x9E, 0x0B, 0xDC, 0xD4,
228+ 0xA6, 0x67, 0xF7, 0x66, 0x3F, 0xFC, 0x42, 0x3B, 0x1B, 0xDB,
229+ 0x4F, 0x66, 0xDC, 0xA5, 0x8F, 0x66, 0xF9, 0xEA, 0xC1, 0xED,
230+ 0x31, 0xFB, 0x48, 0xA1, 0x82, 0x7D, 0xF8, 0xE0, 0xCC, 0xB1,
231+ 0xC7, 0x03, 0xE4, 0xF8, 0xB3, 0xFE, 0xB7, 0xA3, 0x13, 0x73,
232+ 0xA6, 0x7B, 0xC1, 0x0E, 0x39, 0xC7, 0x94, 0x48, 0x26, 0x00,
233+ 0x85, 0x79, 0xFC, 0x6F, 0x7A, 0xAF, 0xC5, 0x52, 0x35, 0x75,
234+ 0xD7, 0x75, 0xA4, 0x40, 0xFA, 0x14, 0x74, 0x61, 0x16, 0xF2,
235+ 0xEB, 0x67, 0x11, 0x6F, 0x04, 0x43, 0x3D, 0x11, 0x14, 0x4C,
236+ 0xA7, 0x94, 0x2A, 0x39, 0xA1, 0xC9, 0x90, 0xCF, 0x83, 0xC6,
237+ 0xFF, 0x02, 0x8F, 0xA3, 0x2A, 0xAC, 0x26, 0xDF, 0x0B, 0x8B,
238+ 0xBE, 0x64, 0x4A, 0xF1, 0xA1, 0xDC, 0xEE, 0xBA, 0xC8, 0x03,
239+ 0x82, 0xF6, 0x62, 0x2C, 0x5D, 0xB6, 0xBB, 0x13, 0x19, 0x6E,
240+ 0x86, 0xC5, 0x5B, 0x2B, 0x5E, 0x3A, 0xF3, 0xB3, 0x28, 0x6B,
241+ 0x70, 0x71, 0x3A, 0x8E, 0xFF, 0x5C, 0x15, 0xE6, 0x02, 0xA4,
242+ 0xCE, 0xED, 0x59, 0x56, 0xCC, 0x15, 0x51, 0x07, 0x79, 0x1A,
243+ 0x0F, 0x25, 0x26, 0x27, 0x30, 0xA9, 0x15, 0xB2, 0xC8, 0xD4,
244+ 0x5C, 0xCC, 0x30, 0xE8, 0x1B, 0xD8, 0xD5, 0x0F, 0x19, 0xA8,
245+ 0x80, 0xA4, 0xC7, 0x01, 0xAA, 0x8B, 0xBA, 0x53, 0xBB, 0x47,
246+ 0xC2, 0x1F, 0x6B, 0x54, 0xB0, 0x17, 0x60, 0xED, 0x79, 0x21,
247+ 0x95, 0xB6, 0x05, 0x84, 0x37, 0xC8, 0x03, 0xA4, 0xDD, 0xD1,
248+ 0x06, 0x69, 0x8F, 0x4C, 0x39, 0xE0, 0xC8, 0x5D, 0x83, 0x1D,
249+ 0xBE, 0x6A, 0x9A, 0x99, 0xF3, 0x9F, 0x0B, 0x45, 0x29, 0xD4,
250+ 0xCB, 0x29, 0x66, 0xEE, 0x1E, 0x7E, 0x3D, 0xD7, 0x13, 0x4E,
251+ 0xDB, 0x90, 0x90, 0x58, 0xCB, 0x5E, 0x9B, 0xCD, 0x2E, 0x2B,
252+ 0x0F, 0xA9, 0x4E, 0x78, 0xAC, 0x05, 0x11, 0x7F, 0xE3, 0x9E,
253+ 0x27, 0xD4, 0x99, 0xE1, 0xB9, 0xBD, 0x78, 0xE1, 0x84, 0x41,
254+ 0xA0, 0xDF
255+ };
256+ static unsigned char dhg_4096[] = {
257+ 0x02
258+ };
259+ DH *dh = DH_new();
260+ BIGNUM *dhp_bn, *dhg_bn;
261+
262+ if (dh == NULL)
263+ return NULL;
264+ dhp_bn = BN_bin2bn(dhp_4096, sizeof (dhp_4096), NULL);
265+ dhg_bn = BN_bin2bn(dhg_4096, sizeof (dhg_4096), NULL);
266+ if (dhp_bn == NULL || dhg_bn == NULL
267+ || !my_DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) {
268+ DH_free(dh);
269+ BN_free(dhp_bn);
270+ BN_free(dhg_bn);
271+ return NULL;
272+ }
273+ return dh;
274+}