From 43fa6f0772c50b2bfea6a0dcdd8261ca1cb12291 Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 16 Oct 2014 15:44:47 +0000 Subject: [PATCH] Revert r270120 (partial), r270122: Restore ABI compatibility with 10.0-RELEASE. Requested by: many Reviewed by: delphij, ache Approved by: re (implicit) Sponsored by: The FreeBSD Foundation git-svn-id: svn://svn.freebsd.org/base/releng/10.1@273169 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- ObsoleteFiles.inc | 4 ++-- contrib/opie/opie.h | 8 ++++---- lib/libopie/Makefile | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 24ce1329c..7dc4a1da1 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -41,8 +41,8 @@ # 20140917: hv_kvpd rc.d script removed in favor of devd configuration OLD_FILES+=etc/rc.d/hv_kvpd # 20140814: libopie version bump -OLD_LIBS+=usr/lib/libopie.so.7 -OLD_LIBS+=usr/lib32/libopie.so.7 +OLD_LIBS+=usr/lib/libopie.so.8 +OLD_LIBS+=usr/lib32/libopie.so.8 # 20140811: otp-sha renamed to otp-sha1 OLD_FILES+=usr/bin/otp-sha OLD_FILES+=usr/share/man/man1/otp-sha.1.gz diff --git a/contrib/opie/opie.h b/contrib/opie/opie.h index 69ba00513..be508c77f 100644 --- a/contrib/opie/opie.h +++ b/contrib/opie/opie.h @@ -69,11 +69,11 @@ struct opie { /* Maximum length of a seed */ #define OPIE_SEED_MAX 16 -/* Max length of hash algorithm name (md4/md5/sha1) */ -#define OPIE_HASHNAME_MAX 4 +/* Max length of hash algorithm name (md4/md5) */ +#define OPIE_HASHNAME_MAX 3 -/* Maximum length of a challenge (otp-md? 9999 seed ext) */ -#define OPIE_CHALLENGE_MAX (4+OPIE_HASHNAME_MAX+1+4+1+OPIE_SEED_MAX+1+3) +/* Maximum length of a challenge (otp-md? 9999 seed) */ +#define OPIE_CHALLENGE_MAX (4+OPIE_HASHNAME_MAX+1+4+1+OPIE_SEED_MAX) /* Maximum length of a response that we allow */ #define OPIE_RESPONSE_MAX (9+1+19+1+9+OPIE_SEED_MAX+1+19+1+19+1+19) diff --git a/lib/libopie/Makefile b/lib/libopie/Makefile index e47e16d18..647bfee1b 100644 --- a/lib/libopie/Makefile +++ b/lib/libopie/Makefile @@ -4,7 +4,7 @@ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 8 +SHLIB_MAJOR= 7 KEYFILE?= \"/etc/opiekeys\" -- 2.45.0