diff options
| author | Timothy Redaelli <tredaelli@redhat.com> | 2018-09-07 15:14:53 +0200 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-09-07 09:57:43 -0700 |
| commit | dc041eae5019a936618c398a2a1d106f65604ccc (patch) | |
| tree | 3ee35b43416a4cd619fe462b3b8f8a7810874625 /build-aux | |
| parent | 3869435f1acd923c8bf95011e5182fb5d6de4404 (diff) | |
| download | openvswitch-dc041eae5019a936618c398a2a1d106f65604ccc.tar.gz | |
dhparams: Fix .c file generation with OpenSSL >= 1.1.1-pre9
Since OpenSSL upstream commit 201b305a2409
("apps/dsaparam.c generates code that is intended to be pasted or included into
an existing source file: the function is static, and the code doesn't include
dsa.h. Match the generated C source style of dsaparam.") "openssl dhparam -C"
generates the get_dh functions as static, but the functions are used inside
stream-ssl.c and so the static keyword cannot be used.
This commit removes the static keyword from the get_dh functions during
dhparams.c file generation by restoring the current behaviour.
Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'build-aux')
| -rwxr-xr-x | build-aux/generate-dhparams-c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build-aux/generate-dhparams-c b/build-aux/generate-dhparams-c index 5d5bba213..dfbdb1f2e 100755 --- a/build-aux/generate-dhparams-c +++ b/build-aux/generate-dhparams-c @@ -25,6 +25,7 @@ EOF (openssl dhparam -C -in lib/dh1024.pem -noout && openssl dhparam -C -in lib/dh2048.pem -noout && openssl dhparam -C -in lib/dh4096.pem -noout) | sed ' + s/^static DH/DH/ s/\(get_dh[0-9]*\)()/\1(void)/ s/\(DH_set0_pqg\)/my_\1/ s/[ ]*$// |