From 03bf8f168d37a98a3f4a42882e8085662cfe1b2b Mon Sep 17 00:00:00 2001
From: miod <>
Date: Fri, 18 Apr 2014 17:32:31 +0000
Subject: Put back i2d_ASN1_SET() and d2i_ASN1_SET() from the NO_ASN1_OLD
 prune, as there are still some 3rd-party code using it, and fixing them is
 not trivial.

As an excuse gift, the memory leaks on failure in resurrected a_set.c have
been fixed.
---
 src/lib/libcrypto/crypto/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/crypto')

diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile
index 62f0861d47..31cab709d9 100644
--- a/src/lib/libcrypto/crypto/Makefile
+++ b/src/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2014/04/18 13:19:03 tedu Exp $
+# $OpenBSD: Makefile,v 1.25 2014/04/18 17:32:31 miod Exp $
 
 LIB=	crypto
 
@@ -57,6 +57,7 @@ SRCS+= f_int.c f_string.c n_pkey.c
 SRCS+= f_enum.c x_pkey.c a_bool.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c
 SRCS+= asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c
 SRCS+= evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c
+SRCS+= a_set.c
 
 # bf/
 SRCS+= bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c
-- 
cgit v1.2.3-55-g6feb