diff options
author | Brent Cook <bcook@openbsd.org> | 2015-06-20 10:40:04 -0500 |
---|---|---|
committer | Brent Cook <bcook@openbsd.org> | 2015-06-20 10:40:04 -0500 |
commit | b9f1b83a79242fcd35cf928c331ff7a0d08908a5 (patch) | |
tree | 7fe3107169630af6dfc83a29b847f66a6394e263 | |
parent | b67c9460bafb71e8f294c6469c15ccd20e65c4c4 (diff) | |
download | portable-b9f1b83a79242fcd35cf928c331ff7a0d08908a5.tar.gz portable-b9f1b83a79242fcd35cf928c331ff7a0d08908a5.tar.bz2 portable-b9f1b83a79242fcd35cf928c331ff7a0d08908a5.zip |
update for mdc2 removal
-rw-r--r-- | crypto/Makefile.am | 5 | ||||
-rw-r--r-- | libtls-standalone/VERSION | 2 | ||||
-rw-r--r-- | tests/Makefile.am | 5 | ||||
-rwxr-xr-x | update.sh | 2 |
4 files changed, 2 insertions, 12 deletions
diff --git a/crypto/Makefile.am b/crypto/Makefile.am index b996488..16efe88 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am | |||
@@ -480,7 +480,6 @@ libcrypto_la_SOURCES += evp/m_gost2814789.c | |||
480 | libcrypto_la_SOURCES += evp/m_gostr341194.c | 480 | libcrypto_la_SOURCES += evp/m_gostr341194.c |
481 | libcrypto_la_SOURCES += evp/m_md4.c | 481 | libcrypto_la_SOURCES += evp/m_md4.c |
482 | libcrypto_la_SOURCES += evp/m_md5.c | 482 | libcrypto_la_SOURCES += evp/m_md5.c |
483 | libcrypto_la_SOURCES += evp/m_mdc2.c | ||
484 | libcrypto_la_SOURCES += evp/m_null.c | 483 | libcrypto_la_SOURCES += evp/m_null.c |
485 | libcrypto_la_SOURCES += evp/m_ripemd.c | 484 | libcrypto_la_SOURCES += evp/m_ripemd.c |
486 | libcrypto_la_SOURCES += evp/m_sha.c | 485 | libcrypto_la_SOURCES += evp/m_sha.c |
@@ -552,10 +551,6 @@ libcrypto_la_SOURCES += md5/md5_dgst.c | |||
552 | libcrypto_la_SOURCES += md5/md5_one.c | 551 | libcrypto_la_SOURCES += md5/md5_one.c |
553 | noinst_HEADERS += md5/md5_locl.h | 552 | noinst_HEADERS += md5/md5_locl.h |
554 | 553 | ||
555 | # mdc2 | ||
556 | libcrypto_la_SOURCES += mdc2/mdc2_one.c | ||
557 | libcrypto_la_SOURCES += mdc2/mdc2dgst.c | ||
558 | |||
559 | # modes | 554 | # modes |
560 | libcrypto_la_SOURCES += modes/cbc128.c | 555 | libcrypto_la_SOURCES += modes/cbc128.c |
561 | libcrypto_la_SOURCES += modes/ccm128.c | 556 | libcrypto_la_SOURCES += modes/ccm128.c |
diff --git a/libtls-standalone/VERSION b/libtls-standalone/VERSION index fd2a018..fcdb2e1 100644 --- a/libtls-standalone/VERSION +++ b/libtls-standalone/VERSION | |||
@@ -1 +1 @@ | |||
3.1.0 | 4.0.0 | ||
diff --git a/tests/Makefile.am b/tests/Makefile.am index 66ace5e..e748912 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
@@ -183,11 +183,6 @@ TESTS += md5test | |||
183 | check_PROGRAMS += md5test | 183 | check_PROGRAMS += md5test |
184 | md5test_SOURCES = md5test.c | 184 | md5test_SOURCES = md5test.c |
185 | 185 | ||
186 | # mdc2test | ||
187 | TESTS += mdc2test | ||
188 | check_PROGRAMS += mdc2test | ||
189 | mdc2test_SOURCES = mdc2test.c | ||
190 | |||
191 | # mont | 186 | # mont |
192 | TESTS += mont | 187 | TESTS += mont |
193 | check_PROGRAMS += mont | 188 | check_PROGRAMS += mont |
@@ -113,7 +113,7 @@ copy_hdrs crypto "stack/stack.h lhash/lhash.h stack/safestack.h | |||
113 | aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h | 113 | aes/aes.h modes/modes.h asn1/asn1t.h dso/dso.h bf/blowfish.h |
114 | bio/bio.h cast/cast.h cmac/cmac.h conf/conf_api.h des/des.h dh/dh.h | 114 | bio/bio.h cast/cast.h cmac/cmac.h conf/conf_api.h des/des.h dh/dh.h |
115 | dsa/dsa.h cms/cms.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h | 115 | dsa/dsa.h cms/cms.h engine/engine.h ui/ui.h pkcs12/pkcs12.h ts/ts.h |
116 | md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.h mdc2/mdc2.h | 116 | md4/md4.h ripemd/ripemd.h whrlpool/whrlpool.h idea/idea.h |
117 | rc2/rc2.h rc4/rc4.h ui/ui_compat.h txt_db/txt_db.h | 117 | rc2/rc2.h rc4/rc4.h ui/ui_compat.h txt_db/txt_db.h |
118 | chacha/chacha.h evp/evp.h poly1305/poly1305.h camellia/camellia.h | 118 | chacha/chacha.h evp/evp.h poly1305/poly1305.h camellia/camellia.h |
119 | gost/gost.h" | 119 | gost/gost.h" |