Attachment 231880 Details for Bug 262004 – patch to fix net/relayd build

[patch] patch to fix net/relayd build

net_relayd_buildfix-rev0.diff (text/plain), 2.27 KB, created by Steve Wills on 2022-02-17 02:41:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2022-02-17 02:41:14 UTC

Size: 2.27 KB

patch

obsolete

>diff --git net/relayd/files/patch-relayd_Makefile net/relayd/files/patch-relayd_Makefile
>new file mode 100644
>index 000000000000..08b89f0f61c9
>--- /dev/null
>+++ net/relayd/files/patch-relayd_Makefile
>@@ -0,0 +1,12 @@
>+--- relayd/Makefile.orig	2014-08-10 20:08:47 UTC
>++++ relayd/Makefile
>+@@ -28,8 +28,7 @@ SRCS+=	parse.y \
>+ 	relay_udp.c \
>+ 	relayd.c \
>+ 	shuffle.c \
>+-	ssl.c \
>+-	ssl_privsep.c
>++	ssl.c
>+ 
>+ .PATH:	${.CURDIR}/../../../libevent
>+ SRCS+=	buffer.c \
>diff --git net/relayd/files/patch-relayd_relay.c net/relayd/files/patch-relayd_relay.c
>index 42c6745bf485..cb0c2378a152 100644
>--- net/relayd/files/patch-relayd_relay.c
>+++ net/relayd/files/patch-relayd_relay.c
>@@ -1,5 +1,23 @@
> --- relayd/relay.c.orig	2014-08-10 20:08:47 UTC
> +++ relayd/relay.c
>+@@ -2097,7 +2097,7 @@ relay_ssl_ctx_create(struct relay *rlay)
>+ 	/* Verify the server certificate if we have a CA chain */
>+ 	if ((rlay->rl_conf.flags & F_SSLCLIENT) &&
>+ 	    (rlay->rl_ssl_ca != NULL)) {
>+-		if (!ssl_ctx_load_verify_memory(ctx,
>++		if (!SSL_CTX_load_verify_mem(ctx,
>+ 		    rlay->rl_ssl_ca, rlay->rl_conf.ssl_ca_len))
>+ 			goto err;
>+ 		SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, NULL);
>+@@ -2107,7 +2107,7 @@ relay_ssl_ctx_create(struct relay *rlay)
>+ 		return (ctx);
>+ 
>+ 	log_debug("%s: loading certificate", __func__);
>+-	if (!ssl_ctx_use_certificate_chain(ctx,
>++	if (!SSL_CTX_use_certificate_chain_mem(ctx,
>+ 	    rlay->rl_ssl_cert, rlay->rl_conf.ssl_cert_len))
>+ 		goto err;
>+ 
> @@ -2716,12 +2716,12 @@ relay_load_certfiles(struct relay *rlay)
>  		return (-1);
>  
>diff --git net/relayd/files/patch-relayd_relayd.h net/relayd/files/patch-relayd_relayd.h
>index a3b511623af1..cbde779fb369 100644
>--- net/relayd/files/patch-relayd_relayd.h
>+++ net/relayd/files/patch-relayd_relayd.h
>@@ -49,3 +49,14 @@
>  
>  /* Attach the control socket to the following process */
>  #define PROC_CONTROL	PROC_PFE
>+@@ -1242,10 +1252,6 @@ int	 ssl_load_pkey(const void *, size_t, char *, off_t
>+ 	    X509 **, EVP_PKEY **);
>+ int	 ssl_ctx_fake_private_key(SSL_CTX *, const void *, size_t,
>+ 	    char *, off_t, X509 **, EVP_PKEY **);
>+-
>+-/* ssl_privsep.c */
>+-int	 ssl_ctx_use_certificate_chain(SSL_CTX *, char *, off_t);
>+-int	 ssl_ctx_load_verify_memory(SSL_CTX *, char *, off_t);
>+ 
>+ /* ca.c */
>+ pid_t	 ca(struct privsep *, struct privsep_proc *);

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 262004: 231880