From 81288dca65923a6787ab147e5b30bfceec126418 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Thu, 3 Mar 2022 08:06:57 +0000
Subject: Do not write out terminating NUL in i2a_ASN1_OBJECT()

The conversion to CBB made us write out an extra NUL since we no longer
use the return value of i2t_ASN1_OBJECT() (which returns strlen(data))
but rather the size of the CBB (which includes a terminal NUL) to write
out data.

Issue found by anton via an openssl-ruby test failure.

ok jsing
---
 src/lib/libcrypto/asn1/a_object.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/asn1/a_object.c b/src/lib/libcrypto/asn1/a_object.c
index c355e5ed20..9a784fd1a6 100644
--- a/src/lib/libcrypto/asn1/a_object.c
+++ b/src/lib/libcrypto/asn1/a_object.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_object.c,v 1.39 2022/03/02 17:45:39 tb Exp $ */
+/* $OpenBSD: a_object.c,v 1.40 2022/03/03 08:06:57 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -447,7 +447,7 @@ i2a_ASN1_OBJECT(BIO *bp, const ASN1_OBJECT *aobj)
 	if (!CBB_finish(&cbb, &data, &data_len))
 		goto err;
 
-	ret = BIO_write(bp, data, data_len);
+	ret = BIO_write(bp, data, strlen(data));
 
  err:
 	CBB_cleanup(&cbb);
-- 
cgit v1.2.3-55-g6feb