summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2013-04-29 17:59:12 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2013-04-29 17:59:12 +0200
commit5782397d77cd243c1174c98051158febe3a21641 (patch)
tree861884ab0072eb6a65f800dc552b69022219dc9a /package
parentaa2345af436cfb40dff27df88cbd4a5fb79d477a (diff)
update to latest upstream
Diffstat (limited to 'package')
-rw-r--r--package/dropbear/Makefile6
-rw-r--r--package/dropbear/patches/patch-options_h17
-rw-r--r--package/heimdal/Makefile10
-rw-r--r--package/heimdal/patches/patch-Makefile_in26
-rw-r--r--package/heimdal/patches/patch-configure8
-rw-r--r--package/heimdal/patches/patch-kdc_config_c18
-rw-r--r--package/heimdal/patches/patch-kdc_kdc-replay_c18
-rw-r--r--package/heimdal/patches/patch-lib_hcrypto_Makefile_in12
-rw-r--r--package/heimdal/patches/patch-lib_roken_Makefile_in8
-rw-r--r--package/heimdal/patches/patch-ltmain_sh11
-rw-r--r--package/openssh/Makefile4
-rw-r--r--package/openssh/patches/patch-cipher_c49
-rw-r--r--package/openssh/patches/patch-mac_c33
13 files changed, 82 insertions, 138 deletions
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index 31d9c68f8..a16c69965 100644
--- a/package/dropbear/Makefile
+++ b/package/dropbear/Makefile
@@ -4,14 +4,16 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= dropbear
-PKG_VERSION:= 2012.55
+PKG_VERSION:= 2013.58
PKG_RELEASE:= 1
-PKG_MD5SUM:= 44836e5a0419ba12557f9ea46880077e
+PKG_MD5SUM:= 8d3579bbbfcea48404a3219643076450
PKG_DESCR:= SSH 2 server/client designed for embedded systems
PKG_SECTION:= net/security
PKG_URL:= http://matt.ucc.asn.au/dropbear/
PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
PKG_DFLT_DROPBEAR:= y if !ADK_TOOLCHAIN_ONLY
PKG_SUBPKGS:= DROPBEAR DBCONVERT
PKGSD_DBCONVERT:= Utility for converting SSH private keys
diff --git a/package/dropbear/patches/patch-options_h b/package/dropbear/patches/patch-options_h
index 0a7dd432b..68a8b2a1b 100644
--- a/package/dropbear/patches/patch-options_h
+++ b/package/dropbear/patches/patch-options_h
@@ -1,16 +1,7 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- dropbear-2012.55.orig/options.h 2012-02-23 14:47:06.000000000 +0100
-+++ dropbear-2012.55/options.h 2012-06-02 20:53:47.000000000 +0200
-@@ -144,7 +144,7 @@ much traffic. */
- #endif
-
- /* Whether to do reverse DNS lookups. */
--#define DO_HOST_LOOKUP
-+/* #define DO_HOST_LOOKUP */
-
- /* Whether to print the message of the day (MOTD). This doesn't add much code
- * size */
-@@ -243,7 +243,7 @@ much traffic. */
+diff -Nur dropbear-2013.58.orig/options.h dropbear-2013.58/options.h
+--- dropbear-2013.58.orig/options.h 2013-04-18 16:58:14.000000000 +0200
++++ dropbear-2013.58/options.h 2013-04-29 14:28:47.000000000 +0200
+@@ -247,7 +247,7 @@
/* The command to invoke for xauth when using X11 forwarding.
* "-q" for quiet */
#ifndef XAUTH_COMMAND
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 785dfeefb..1647234a5 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= heimdal
-PKG_VERSION:= 1.4
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 31d08bbf47a77827fe97ef3f52b4c9c4
+PKG_VERSION:= 1.5.2
+PKG_RELEASE:= 1
+PKG_MD5SUM:= bb23d9dbdafd395d816f7abc598481a1
PKG_DESCR:= Kerberos 5 server
PKG_SECTION:= crypto
PKG_BUILDDEP:= openssl ncurses e2fsprogs readline
@@ -86,7 +86,7 @@ post-extract:
${MAKE} -C ${WRKBUILD}/include
${MAKE} -C ${WRKBUILD}/lib/roken
${MAKE} -C ${WRKBUILD}/lib/vers
- ${MAKE} -C ${WRKBUILD}/lib/editline
+ ${MAKE} -C ${WRKBUILD}/lib/libedit
${MAKE} -C ${WRKBUILD}/lib/com_err compile_et$(EXEEXT) LDFLAGS="-all-static"
${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT) LDFLAGS="-all-static"
${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT) LDFLAGS="-all-static"
@@ -151,7 +151,7 @@ endif
${IDIR_LIBHEIMDAL}/usr/lib/heimdal
# heimdal client libs
${INSTALL_DIR} ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
- ${CP} ${WRKINST}/usr/lib/heimdal/libeditline.so* \
+ ${CP} ${WRKINST}/usr/lib/heimdal/libheimedit.so* \
${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* \
${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
diff --git a/package/heimdal/patches/patch-Makefile_in b/package/heimdal/patches/patch-Makefile_in
index d1883a559..d0c4cf0e3 100644
--- a/package/heimdal/patches/patch-Makefile_in
+++ b/package/heimdal/patches/patch-Makefile_in
@@ -1,24 +1,20 @@
---- heimdal-1.4.orig/Makefile.in 2010-09-13 09:24:25.000000000 +0200
-+++ heimdal-1.4/Makefile.in 2011-01-12 14:10:53.848658254 +0100
-@@ -114,8 +114,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
- distdir dist dist-all distcheck
+--- heimdal-1.5.2.orig/Makefile.in 2012-01-11 14:04:33.000000000 +0100
++++ heimdal-1.5.2/Makefile.in 2013-04-29 16:39:03.000000000 +0200
+@@ -116,7 +116,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
ETAGS = etags
CTAGS = ctags
--DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm appl doc \
-- tools tests packages etc po
-+DIST_SUBDIRS = include lib kuser kdc admin kadmin kpasswd kcm \
-+ tools packages etc
+ DIST_SUBDIRS = include base lib kuser kdc admin kadmin kpasswd kcm \
+- appl tools tests packages etc po doc
++ tools tests packages etc po doc
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
-@@ -392,8 +392,8 @@ LIB_kafs = $(top_builddir)/lib/kafs/libk
- @KRB5_TRUE@LIB_tsasl = $(top_builddir)/lib/tsasl/libtsasl.la
+@@ -400,7 +400,7 @@ LIB_heimbase = $(top_builddir)/base/libh
@DCE_TRUE@LIB_kdfs = $(top_builddir)/lib/kdfs/libkdfs.la
@KCM_TRUE@kcm_dir = kcm
--SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) appl \
-- doc tools tests packages etc po
-+SUBDIRS = include lib kuser kdc admin kadmin kpasswd $(kcm_dir) \
-+ tools packages etc
+ SUBDIRS = include base lib kuser kdc admin kadmin kpasswd $(kcm_dir) \
+- appl tools tests packages etc po $(am__append_1)
++ tools tests packages etc po $(am__append_1)
ACLOCAL_AMFLAGS = -I cf
EXTRA_DIST = \
- TODO \
+ NTMakefile \
diff --git a/package/heimdal/patches/patch-configure b/package/heimdal/patches/patch-configure
index 29a003f6b..6a8d652d3 100644
--- a/package/heimdal/patches/patch-configure
+++ b/package/heimdal/patches/patch-configure
@@ -1,6 +1,6 @@
---- heimdal-1.4.orig/configure 2010-09-13 09:24:11.000000000 +0200
-+++ heimdal-1.4/configure 2011-01-11 18:51:09.154898347 +0100
-@@ -26892,7 +26892,7 @@ rm -fr conftest*
+--- heimdal-1.5.2.orig/configure 2012-01-11 14:04:10.000000000 +0100
++++ heimdal-1.5.2/configure 2013-04-29 16:35:46.000000000 +0200
+@@ -28318,7 +28318,7 @@ rm -fr conftest*
fi
if test "${krb_cv_compile_et_cross}" = yes ; then
@@ -9,7 +9,7 @@
elif test "${krb_cv_compile_et}" = "yes"; then
krb_cv_save_LIBS="${LIBS}"
LIBS="${LIBS} -lcom_err"
-@@ -26928,6 +26928,7 @@ else
+@@ -28354,6 +28354,7 @@ else
krb_cv_com_err="no"
fi
diff --git a/package/heimdal/patches/patch-kdc_config_c b/package/heimdal/patches/patch-kdc_config_c
deleted file mode 100644
index 104086102..000000000
--- a/package/heimdal/patches/patch-kdc_config_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- heimdal-1.4.orig/kdc/config.c 2010-09-13 09:23:34.000000000 +0200
-+++ heimdal-1.4/kdc/config.c 2011-01-12 13:55:17.454913780 +0100
-@@ -347,6 +347,7 @@ configure(krb5_context context, int argc
-
- #endif
-
-+#ifdef PKINIT
- if (config->enable_pkinit) {
- if (config->pkinit_kdc_identity == NULL)
- krb5_errx(context, 1, "pkinit enabled but no identity");
-@@ -361,6 +362,7 @@ configure(krb5_context context, int argc
- config->pkinit_kdc_revoke);
-
- }
-+#endif
-
- return config;
- }
diff --git a/package/heimdal/patches/patch-kdc_kdc-replay_c b/package/heimdal/patches/patch-kdc_kdc-replay_c
deleted file mode 100644
index 504e4962f..000000000
--- a/package/heimdal/patches/patch-kdc_kdc-replay_c
+++ /dev/null
@@ -1,18 +0,0 @@
---- heimdal-1.4.orig/kdc/kdc-replay.c 2010-09-13 09:23:34.000000000 +0200
-+++ heimdal-1.4/kdc/kdc-replay.c 2011-01-12 14:08:08.048658301 +0100
-@@ -86,6 +86,7 @@ main(int argc, char **argv)
- if (ret)
- krb5_err(context, 1, ret, "krb5_kdc_set_dbinfo");
-
-+#ifdef PKINIT
- if (config->enable_pkinit) {
- if (config->pkinit_kdc_identity == NULL)
- krb5_errx(context, 1, "pkinit enabled but no identity");
-@@ -100,6 +101,7 @@ main(int argc, char **argv)
- config->pkinit_kdc_revoke);
-
- }
-+#endif
-
- if (argc != 2)
- errx(1, "argc != 2");
diff --git a/package/heimdal/patches/patch-lib_hcrypto_Makefile_in b/package/heimdal/patches/patch-lib_hcrypto_Makefile_in
deleted file mode 100644
index fb16d3504..000000000
--- a/package/heimdal/patches/patch-lib_hcrypto_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
---- heimdal-1.4.orig/lib/hcrypto/Makefile.in 2010-09-13 09:24:20.000000000 +0200
-+++ heimdal-1.4/lib/hcrypto/Makefile.in 2011-01-11 20:11:30.955611146 +0100
-@@ -716,6 +716,9 @@ imathsource = \
- imath/iprime.h
-
- ltmsources = \
-+ libtommath/tommath.h \
-+ libtommath/tommath_class.h \
-+ libtommath/tommath_superclass.h \
- libtommath/bncore.c \
- libtommath/bn_mp_init.c \
- libtommath/bn_mp_clear.c \
diff --git a/package/heimdal/patches/patch-lib_roken_Makefile_in b/package/heimdal/patches/patch-lib_roken_Makefile_in
index a5b84a201..38ad2996b 100644
--- a/package/heimdal/patches/patch-lib_roken_Makefile_in
+++ b/package/heimdal/patches/patch-lib_roken_Makefile_in
@@ -1,6 +1,6 @@
---- heimdal-1.4.orig/lib/roken/Makefile.in 2010-09-13 09:24:23.000000000 +0200
-+++ heimdal-1.4/lib/roken/Makefile.in 2010-11-10 19:56:51.764995802 +0100
-@@ -726,9 +726,6 @@ getifaddrs-test$(EXEEXT): $(getifaddrs_t
+--- heimdal-1.5.2.orig/lib/roken/Makefile.in 2012-01-11 14:04:30.000000000 +0100
++++ heimdal-1.5.2/lib/roken/Makefile.in 2013-04-29 16:35:46.000000000 +0200
+@@ -747,9 +747,6 @@ getifaddrs-test$(EXEEXT): $(getifaddrs_t
hex-test$(EXEEXT): $(hex_test_OBJECTS) $(hex_test_DEPENDENCIES)
@rm -f hex-test$(EXEEXT)
$(LINK) $(hex_test_OBJECTS) $(hex_test_LDADD) $(LIBS)
@@ -10,7 +10,7 @@
parse_bytes-test$(EXEEXT): $(parse_bytes_test_OBJECTS) $(parse_bytes_test_DEPENDENCIES)
@rm -f parse_bytes-test$(EXEEXT)
$(LINK) $(parse_bytes_test_OBJECTS) $(parse_bytes_test_LDADD) $(LIBS)
-@@ -1977,18 +1974,18 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok
+@@ -2033,18 +2030,18 @@ $(LTLIBOBJS) $(libroken_la_OBJECTS): rok
.hin.h:
cp $< $@
diff --git a/package/heimdal/patches/patch-ltmain_sh b/package/heimdal/patches/patch-ltmain_sh
deleted file mode 100644
index fcf6dad2c..000000000
--- a/package/heimdal/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- heimdal-1.4.orig/ltmain.sh 2010-09-13 09:24:01.000000000 +0200
-+++ heimdal-1.4/ltmain.sh 2011-01-15 20:52:41.000000000 +0100
-@@ -4238,7 +4238,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"
diff --git a/package/openssh/Makefile b/package/openssh/Makefile
index 099abe752..f7def86ad 100644
--- a/package/openssh/Makefile
+++ b/package/openssh/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= openssh
-PKG_VERSION:= 6.1p1
+PKG_VERSION:= 6.2p1
PKG_RELEASE:= 1
-PKG_MD5SUM:= 3345cbf4efe90ffb06a78670ab2d05d5
+PKG_MD5SUM:= 7b2d9dd75b5cf267ea1737ec75500316
PKG_DESCR:= OpenSSH
PKG_SECTION:= net/security
PKG_BUILDDEP:= zlib openssl
diff --git a/package/openssh/patches/patch-cipher_c b/package/openssh/patches/patch-cipher_c
index b0a91afea..88f5d11d9 100644
--- a/package/openssh/patches/patch-cipher_c
+++ b/package/openssh/patches/patch-cipher_c
@@ -1,34 +1,37 @@
---- openssh-5.4p1.orig/cipher.c 2009-01-28 06:38:41.000000000 +0100
-+++ openssh-5.4p1/cipher.c 2010-03-17 16:24:25.000000000 +0100
-@@ -69,21 +69,30 @@ struct Cipher {
- { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, EVP_enc_null },
- { "des", SSH_CIPHER_DES, 8, 8, 0, 1, EVP_des_cbc },
- { "3des", SSH_CIPHER_3DES, 8, 16, 0, 1, evp_ssh1_3des },
+diff -Nur openssh-6.2p1.orig/cipher.c openssh-6.2p1/cipher.c
+--- openssh-6.2p1.orig/cipher.c 2013-02-12 01:00:35.000000000 +0100
++++ openssh-6.2p1/cipher.c 2013-04-29 15:10:49.000000000 +0200
+@@ -69,23 +69,33 @@
+ { "none", SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },
+ { "des", SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc },
+ { "3des", SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des },
+#ifndef OPENSSL_NO_BF
- { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, 0, 1, evp_ssh1_bf },
--
+ { "blowfish", SSH_CIPHER_BLOWFISH, 8, 32, 0, 0, 0, 1, evp_ssh1_bf },
+#endif
- { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 1, EVP_des_ede3_cbc },
+
+ { "3des-cbc", SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },
+#ifndef OPENSSL_NO_BF
- { "blowfish-cbc", SSH_CIPHER_SSH2, 8, 16, 0, 1, EVP_bf_cbc },
+ { "blowfish-cbc",
+ SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_bf_cbc },
+#endif
+#ifndef OPENSSL_NO_CAST
- { "cast128-cbc", SSH_CIPHER_SSH2, 8, 16, 0, 1, EVP_cast5_cbc },
+ { "cast128-cbc",
+ SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 1, EVP_cast5_cbc },
+#endif
- { "arcfour", SSH_CIPHER_SSH2, 8, 16, 0, 0, EVP_rc4 },
- { "arcfour128", SSH_CIPHER_SSH2, 8, 16, 1536, 0, EVP_rc4 },
- { "arcfour256", SSH_CIPHER_SSH2, 8, 32, 1536, 0, EVP_rc4 },
- { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, 0, 1, EVP_aes_128_cbc },
+ { "arcfour", SSH_CIPHER_SSH2, 8, 16, 0, 0, 0, 0, EVP_rc4 },
+ { "arcfour128", SSH_CIPHER_SSH2, 8, 16, 0, 0, 1536, 0, EVP_rc4 },
+ { "arcfour256", SSH_CIPHER_SSH2, 8, 32, 0, 0, 1536, 0, EVP_rc4 },
+ { "aes128-cbc", SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 1, EVP_aes_128_cbc },
+#ifndef OPENSSL_NO_AES192
- { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, 0, 1, EVP_aes_192_cbc },
+ { "aes192-cbc", SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 1, EVP_aes_192_cbc },
+#endif
- { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc },
+ { "aes256-cbc", SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
{ "rijndael-cbc@lysator.liu.se",
- SSH_CIPHER_SSH2, 16, 32, 0, 1, EVP_aes_256_cbc },
- { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, 0, 0, evp_aes_128_ctr },
+ SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },
+ { "aes128-ctr", SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 0, EVP_aes_128_ctr },
+#ifndef OPENSSL_NO_AES192
- { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, 0, 0, evp_aes_128_ctr },
+ { "aes192-ctr", SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 0, EVP_aes_192_ctr },
+#endif
- { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, 0, 0, evp_aes_128_ctr },
- #ifdef USE_CIPHER_ACSS
- { "acss@openssh.org", SSH_CIPHER_SSH2, 16, 5, 0, 0, EVP_acss },
+ { "aes256-ctr", SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 0, EVP_aes_256_ctr },
+ #ifdef OPENSSL_HAVE_EVPGCM
+ { "aes128-gcm@openssh.com",
diff --git a/package/openssh/patches/patch-mac_c b/package/openssh/patches/patch-mac_c
index 1d4286e29..c06cbe38a 100644
--- a/package/openssh/patches/patch-mac_c
+++ b/package/openssh/patches/patch-mac_c
@@ -1,13 +1,24 @@
---- openssh-5.4p1.orig/mac.c 2008-06-13 02:58:50.000000000 +0200
-+++ openssh-5.4p1/mac.c 2010-03-17 16:24:25.000000000 +0100
-@@ -59,8 +59,10 @@ struct {
- { "hmac-sha1-96", SSH_EVP, EVP_sha1, 96, -1, -1 },
- { "hmac-md5", SSH_EVP, EVP_md5, 0, -1, -1 },
- { "hmac-md5-96", SSH_EVP, EVP_md5, 96, -1, -1 },
+diff -Nur openssh-6.2p1.orig/mac.c openssh-6.2p1/mac.c
+--- openssh-6.2p1.orig/mac.c 2012-12-12 01:00:37.000000000 +0100
++++ openssh-6.2p1/mac.c 2013-04-29 15:14:29.000000000 +0200
+@@ -68,8 +68,10 @@
+ #endif
+ { "hmac-md5", SSH_EVP, EVP_md5, 0, 0, 0, 0 },
+ { "hmac-md5-96", SSH_EVP, EVP_md5, 96, 0, 0, 0 },
+#ifndef OPENSSL_NO_RIPEMD
- { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, -1, -1 },
- { "hmac-ripemd160@openssh.com", SSH_EVP, EVP_ripemd160, 0, -1, -1 },
+ { "hmac-ripemd160", SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 },
+ { "hmac-ripemd160@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 0 },
+#endif
- { "umac-64@openssh.com", SSH_UMAC, NULL, 0, 128, 64 },
- { NULL, 0, NULL, 0, -1, -1 }
- };
+ { "umac-64@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 0 },
+ { "umac-128@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 0 },
+
+@@ -82,7 +84,9 @@
+ #endif
+ { "hmac-md5-etm@openssh.com", SSH_EVP, EVP_md5, 0, 0, 0, 1 },
+ { "hmac-md5-96-etm@openssh.com", SSH_EVP, EVP_md5, 96, 0, 0, 1 },
++#ifndef OPENSSL_NO_RIPEMD
+ { "hmac-ripemd160-etm@openssh.com", SSH_EVP, EVP_ripemd160, 0, 0, 0, 1 },
++#endif
+ { "umac-64-etm@openssh.com", SSH_UMAC, NULL, 0, 128, 64, 1 },
+ { "umac-128-etm@openssh.com", SSH_UMAC128, NULL, 0, 128, 128, 1 },
+