| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 0fe6770b617af7e400abc6f8652c1417d4c3575e Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sat, 8 Sep 2018 22:49:15 -0700 |
| 4 | Subject: [PATCH] generate not static get_dh* functions |
| 5 | |
| 6 | Fixes build with OpenSSL 1.1.x |
| 7 | |
| 8 | Upstream-Status: Pending |
| 9 | |
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- |
| 12 | lib/automake.mk | 5 +++-- |
| 13 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 14 | |
| 15 | diff --git a/lib/automake.mk b/lib/automake.mk |
| 16 | index bfbeb94..b53909a 100644 |
| 17 | --- a/lib/automake.mk |
| 18 | +++ b/lib/automake.mk |
| 19 | @@ -113,8 +113,9 @@ lib/dhparams.c: lib/dh1024.pem lib/dh2048.pem lib/dh4096.pem |
| 20 | (echo '#include "lib/dhparams.h"' && \ |
| 21 | openssl dhparam -C -in $(srcdir)/lib/dh1024.pem -noout && \ |
| 22 | openssl dhparam -C -in $(srcdir)/lib/dh2048.pem -noout && \ |
| 23 | - openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) \ |
| 24 | - | sed 's/\(get_dh[0-9]*\)()/\1(void)/' > lib/dhparams.c.tmp |
| 25 | + openssl dhparam -C -in $(srcdir)/lib/dh4096.pem -noout) | \ |
| 26 | + sed -e 's/\(get_dh[0-9]*\)()/\1(void)/' \ |
| 27 | + -e 's/static DH \*get_dh/DH \*get_dh/' > lib/dhparams.c.tmp |
| 28 | mv lib/dhparams.c.tmp lib/dhparams.c |
| 29 | endif |
| 30 | |
| 31 | -- |
| 32 | 2.18.0 |
| 33 | |