diff options
author | Miod Vallat <miod@cvs.openbsd.org> | 2014-05-12 19:14:15 +0000 |
---|---|---|
committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-05-12 19:14:15 +0000 |
commit | 97c0b738a3a087600fe0e1b9a9a61b6213096276 (patch) | |
tree | be91984761e3fc5fb17718e9402c724b716db9fd /lib/libcrypto/crypto | |
parent | 74442a9380130318b2589077567fc5246e7a9bfb (diff) |
Move the `pqueue' part of libcrypto, which is a glorified sorted linked list
of 64-bit data, and only used by DTLS, to libssl where it belongs.
Remove pqueue_print() which is a debugging interface and serves no useful
purpose, except for the regress test, which grows its own pqueue_print()
routine.
Bump libcrypto major and libssl minor.
WARNING: do not update your tree right now, more changes are coming, which
will ride the libcrypto major bump.
Diffstat (limited to 'lib/libcrypto/crypto')
-rw-r--r-- | lib/libcrypto/crypto/Makefile | 7 | ||||
-rw-r--r-- | lib/libcrypto/crypto/shlib_version | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/lib/libcrypto/crypto/Makefile b/lib/libcrypto/crypto/Makefile index 5fefdb1cf0b..ce04ac9e612 100644 --- a/lib/libcrypto/crypto/Makefile +++ b/lib/libcrypto/crypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2014/05/04 17:12:19 miod Exp $ +# $OpenBSD: Makefile,v 1.32 2014/05/12 19:14:14 miod Exp $ LIB= crypto @@ -198,9 +198,6 @@ SRCS+= p12_utl.c p12_npas.c pk12err.c p12_p8d.c p12_p8e.c SRCS+= pk7_asn1.c pk7_lib.c pkcs7err.c pk7_doit.c pk7_smime.c pk7_attr.c SRCS+= pk7_mime.c bio_pk7.c -# pqueue/ -SRCS+= pqueue.c - # rand/ SRCS+= randfile.c rand_lib.c rand_err.c @@ -304,7 +301,6 @@ SRCS+= v3_asid.c v3_addr.c ${LCRYPTO_SRC}/perlasm \ ${LCRYPTO_SRC}/pkcs12 \ ${LCRYPTO_SRC}/pkcs7 \ - ${LCRYPTO_SRC}/pqueue \ ${LCRYPTO_SRC}/rand \ ${LCRYPTO_SRC}/rc2 \ ${LCRYPTO_SRC}/rc4 \ @@ -367,7 +363,6 @@ HDRS=\ crypto/pem/pem2.h \ crypto/pkcs12/pkcs12.h \ crypto/pkcs7/pkcs7.h \ - crypto/pqueue/pqueue.h \ crypto/rand/rand.h \ crypto/rc2/rc2.h \ crypto/rc4/rc4.h \ diff --git a/lib/libcrypto/crypto/shlib_version b/lib/libcrypto/crypto/shlib_version index 72168dfd16a..54ef0c4cc0c 100644 --- a/lib/libcrypto/crypto/shlib_version +++ b/lib/libcrypto/crypto/shlib_version @@ -1,2 +1,2 @@ -major=26 -minor=1 +major=27 +minor=0 |