summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/crypto
diff options
context:
space:
mode:
authormiod <>2014-04-18 17:32:31 +0000
committermiod <>2014-04-18 17:32:31 +0000
commit0b47fa2bab5b51d4929f5347baa45bcef8856d90 (patch)
treedba66643fe8afbf27d4baab6c8cdf4d3e896f3a1 /src/lib/libcrypto/crypto
parentf6130bd40807568ae84a0351ec561620b9bcc6cd (diff)
downloadopenbsd-0b47fa2bab5b51d4929f5347baa45bcef8856d90.tar.gz
openbsd-0b47fa2bab5b51d4929f5347baa45bcef8856d90.tar.bz2
openbsd-0b47fa2bab5b51d4929f5347baa45bcef8856d90.zip
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.
Diffstat (limited to 'src/lib/libcrypto/crypto')
-rw-r--r--src/lib/libcrypto/crypto/Makefile3
1 files changed, 2 insertions, 1 deletions
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 @@
1# $OpenBSD: Makefile,v 1.24 2014/04/18 13:19:03 tedu Exp $ 1# $OpenBSD: Makefile,v 1.25 2014/04/18 17:32:31 miod Exp $
2 2
3LIB= crypto 3LIB= crypto
4 4
@@ -57,6 +57,7 @@ SRCS+= f_int.c f_string.c n_pkey.c
57SRCS+= f_enum.c x_pkey.c a_bool.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c 57SRCS+= f_enum.c x_pkey.c a_bool.c x_exten.c bio_asn1.c bio_ndef.c asn_mime.c
58SRCS+= asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c 58SRCS+= asn1_gen.c asn1_par.c asn1_lib.c asn1_err.c a_bytes.c a_strnid.c
59SRCS+= evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c 59SRCS+= evp_asn1.c asn_pack.c p5_pbe.c p5_pbev2.c p8_pkey.c asn_moid.c
60SRCS+= a_set.c
60 61
61# bf/ 62# bf/
62SRCS+= bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c 63SRCS+= bf_skey.c bf_ecb.c bf_cfb64.c bf_ofb64.c