Attachment #210249 for bug #242863

Lines 4-9 Link Here

(-)Makefile (-1 / +2 lines)
4	PORTNAME= h2o	4	PORTNAME= h2o
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 2.2.6	6	DISTVERSION= 2.2.6
		7	PORTREVISION= 1
7	CATEGORIES= www	8	CATEGORIES= www
8		9
9	MAINTAINER= dch@FreeBSD.org	10	MAINTAINER= dch@FreeBSD.org
Lines 22-28 Link Here
22	USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig	23	USES= cmake:noninja compiler:c11 cpe perl5 shebangfix ssl pkgconfig
23	USE_GITHUB= yes	24	USE_GITHUB= yes
24	USE_PERL5= run	25	USE_PERL5= run
25	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
26		27
27	CPE_VENDOR= h2o_project	28	CPE_VENDOR= h2o_project
28		29




--- deps/neverbleed/neverbleed.c.orig	2019-12-27 07:57:52 UTC
+++ deps/neverbleed/neverbleed.c
@@ -632,7 +632,7 @@ static int sign_stub(struct expbuf_t *buf)
 
 #if !OPENSSL_1_1_API
 
-static void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
+void RSA_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e, const BIGNUM **d)
 {
     if (n) {
         *n = rsa->n;
@@ -647,7 +647,7 @@ static void RSA_get0_key(const RSA *rsa, const BIGNUM 
     }
 }
 
-static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d)
+int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e, BIGNUM *d)
 {
     if (n == NULL || e == NULL) {
         return 0;
@@ -663,7 +663,7 @@ static int RSA_set0_key(RSA *rsa, BIGNUM *n, BIGNUM *e
     return 1;
 }
 
-static void RSA_set_flags(RSA *r, int flags)
+void RSA_set_flags(RSA *r, int flags)
 {
     r->flags |= flags;
 }

Return to bug 242863

Line 0 Link Here

(-)files/patch-deps_neverbleed-neverbleed.c (+29 lines)
	1	--- deps/neverbleed/neverbleed.c.orig 2019-12-27 07:57:52 UTC
	2	+++ deps/neverbleed/neverbleed.c
	3	@@ -632,7 +632,7 @@ static int sign_stub(struct expbuf_t *buf)
	4
	5	#if !OPENSSL_1_1_API
	6
	7	-static void RSA_get0_key(const RSA rsa, const BIGNUM n, const BIGNUM e, const BIGNUM *d)
	8	+void RSA_get0_key(const RSA rsa, const BIGNUM n, const BIGNUM e, const BIGNUM *d)
	9	{
	10	if (n) {
	11	*n = rsa->n;
	12	@@ -647,7 +647,7 @@ static void RSA_get0_key(const RSA *rsa, const BIGNUM
	13	}
	14	}
	15
	16	-static int RSA_set0_key(RSA rsa, BIGNUM n, BIGNUM e, BIGNUM d)
	17	+int RSA_set0_key(RSA rsa, BIGNUM n, BIGNUM e, BIGNUM d)
	18	{
	19	if (n == NULL \|\| e == NULL) {
	20	return 0;
	21	@@ -663,7 +663,7 @@ static int RSA_set0_key(RSA rsa, BIGNUM n, BIGNUM *e
	22	return 1;
	23	}
	24
	25	-static void RSA_set_flags(RSA *r, int flags)
	26	+void RSA_set_flags(RSA *r, int flags)
	27	{
	28	r->flags \|= flags;
	29	}