mirror of
https://git.freebsd.org/ports.git
synced 2025-06-14 17:20:29 -04:00
c7369f228e
newish OpenSSL versions [*] - Add a handful of useful patches from upstream SRPM - Use upstream program description for COMMENT (shorter) - Utilize its own installation target and only post-install documentation files; install sample configuration file - Consummate conversion to option helpers and transfer maintainership to the new volunteer PR: 234556 [*]
54 lines
1.2 KiB
Diff
54 lines
1.2 KiB
Diff
From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
|
|
Date: Sun, 19 Feb 2017 14:34:38 +0100
|
|
Subject: [PATCH] pound: Add support for openssl 1.1
|
|
|
|
This patch adds support for "openssl dhparam -C" created header files where
|
|
openssl binary itself is 1.1 but the code using the file is linked against
|
|
1.0.2.
|
|
This will not let the pound as compile against openssl 1.1.
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
|
|
---
|
|
svc.c | 31 +++++++++++++++++++++++++++++++
|
|
1 file changed, 31 insertions(+)
|
|
|
|
--- a/svc.c
|
|
+++ b/svc.c
|
|
@@ -1448,6 +1448,37 @@ 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
|