oasis

commit: 32023c3ff53d51ac3e7384f3da2a6cc799889c18
parent 89a6e7eeef09fd1ec29c1c97a45eff20eca41901
Author: Michael Forney <mforney@mforney.org>
Date:   Mon, 10 May 2021 16:25:25 -0700

acme-client: Include PEM null terminator in buffer allocation

Diffstat:
M
pkg/openbsd/patch/0036-acme-client-Port-to-BearSSL.patch
8
++++----

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pkg/openbsd/patch/0036-acme-client-Port-to-BearSSL.patch b/pkg/openbsd/patch/0036-acme-client-Port-to-BearSSL.patch
@@ -1,4 +1,4 @@
-From 8874beb0ee8741d4de4acabdd55c3dcc886b7585 Mon Sep 17 00:00:00 2001
+From 7a7651831514493537b25975ab9c6866d15050d7 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 23 Apr 2021 23:14:16 -0700
 Subject: [PATCH] acme-client: Port to BearSSL
@@ -543,7 +543,7 @@ index f443d573675..85c3897a4b8 100644
  
  #define BEGIN_MARKER "-----BEGIN CERTIFICATE-----"
 diff --git a/usr.sbin/acme-client/key.c b/usr.sbin/acme-client/key.c
-index 1bc1eee8f59..5a74fba5b3c 100644
+index 1bc1eee8f59..e95f737d22c 100644
 --- a/usr.sbin/acme-client/key.c
 +++ b/usr.sbin/acme-client/key.c
 @@ -17,15 +17,11 @@
@@ -654,7 +654,7 @@ index 1bc1eee8f59..5a74fba5b3c 100644
 +	}
 +	br_encode_rsa_raw_der(der, &key->rsa.sk, &key->rsa.pk, d, sizeof(d));
 +	pemlen = br_pem_encode(NULL, der, derlen, BR_ENCODE_PEM_RSA_RAW, 0);
-+	if ((pem = malloc(pemlen)) == NULL) {
++	if ((pem = malloc(pemlen + 1)) == NULL) {
 +		warn("malloc");
 +		goto err;
 +	}
@@ -743,7 +743,7 @@ index 1bc1eee8f59..5a74fba5b3c 100644
  	}
 +	br_encode_ec_raw_der(der, &key->ec.sk, &key->ec.pk);
 +	pemlen = br_pem_encode(NULL, der, derlen, BR_ENCODE_PEM_EC_RAW, 0);
-+	if ((pem = malloc(pemlen)) == NULL) {
++	if ((pem = malloc(pemlen + 1)) == NULL) {
 +		warn("malloc");
 +		goto err;
 +	}