summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2022-03-03 08:06:57 +0000
committertb <>2022-03-03 08:06:57 +0000
commit81288dca65923a6787ab147e5b30bfceec126418 (patch)
treef72e864f2411cb013c3b5e480adf8d237e4b1349 /src/lib
parent793b5ff0ce93ee7babdf5a39b3ab1e9037a694e2 (diff)
downloadopenbsd-81288dca65923a6787ab147e5b30bfceec126418.tar.gz
openbsd-81288dca65923a6787ab147e5b30bfceec126418.tar.bz2
openbsd-81288dca65923a6787ab147e5b30bfceec126418.zip
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
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/asn1/a_object.c4
1 files changed, 2 insertions, 2 deletions
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 @@
1/* $OpenBSD: a_object.c,v 1.39 2022/03/02 17:45:39 tb Exp $ */ 1/* $OpenBSD: a_object.c,v 1.40 2022/03/03 08:06:57 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -447,7 +447,7 @@ i2a_ASN1_OBJECT(BIO *bp, const ASN1_OBJECT *aobj)
447 if (!CBB_finish(&cbb, &data, &data_len)) 447 if (!CBB_finish(&cbb, &data, &data_len))
448 goto err; 448 goto err;
449 449
450 ret = BIO_write(bp, data, data_len); 450 ret = BIO_write(bp, data, strlen(data));
451 451
452 err: 452 err:
453 CBB_cleanup(&cbb); 453 CBB_cleanup(&cbb);