From owner-svn-src-all@FreeBSD.ORG Tue Aug 21 09:05:24 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 879CE106566B; Tue, 21 Aug 2012 09:05:24 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 599C48FC15; Tue, 21 Aug 2012 09:05:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7L95Ok8001402; Tue, 21 Aug 2012 09:05:24 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7L95O95001398; Tue, 21 Aug 2012 09:05:24 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201208210905.q7L95O95001398@svn.freebsd.org> From: Xin LI Date: Tue, 21 Aug 2012 09:05:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239482 - releng/9.1/contrib/opie/libopie X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Aug 2012 09:05:24 -0000 Author: delphij Date: Tue Aug 21 09:05:23 2012 New Revision: 239482 URL: http://svn.freebsd.org/changeset/base/239482 Log: MFC r239169: RFC 2289 requires all hashes be stored in little endian format before folding to 64 bits, while SHA1 code is big endian. Therefore, a bswap32 is required before using the value. Without this change, the implementation does not conform to test vector found in RFC 2289. PR: bin/170519 Submitted by: Arthur Mesh (with changes) Approved by: re (kib) Modified: releng/9.1/contrib/opie/libopie/hash.c releng/9.1/contrib/opie/libopie/hashlen.c Directory Properties: releng/9.1/contrib/opie/ (props changed) Modified: releng/9.1/contrib/opie/libopie/hash.c ============================================================================== --- releng/9.1/contrib/opie/libopie/hash.c Tue Aug 21 08:31:30 2012 (r239481) +++ releng/9.1/contrib/opie/libopie/hash.c Tue Aug 21 09:05:23 2012 (r239482) @@ -17,6 +17,8 @@ you didn't get a copy, you may request o $FreeBSD$ */ +#include + #include "opie_cfg.h" #include "opie.h" @@ -39,6 +41,13 @@ unsigned algorithm) SHA1_Final((unsigned char *)digest, &sha); results[0] = digest[0] ^ digest[2] ^ digest[4]; results[1] = digest[1] ^ digest[3]; + + /* + * RFC2289 mandates that we convert SHA1 digest from big-endian to little + * see Appendix A. + */ + results[0] = bswap32(results[0]); + results[1] = bswap32(results[1]); }; break; case 4: Modified: releng/9.1/contrib/opie/libopie/hashlen.c ============================================================================== --- releng/9.1/contrib/opie/libopie/hashlen.c Tue Aug 21 08:31:30 2012 (r239481) +++ releng/9.1/contrib/opie/libopie/hashlen.c Tue Aug 21 09:05:23 2012 (r239482) @@ -14,6 +14,8 @@ you didn't get a copy, you may request o $FreeBSD$ */ +#include + #include "opie_cfg.h" #include "opie.h" @@ -36,6 +38,13 @@ VOIDPTR in AND struct opie_otpkey *out A SHA1_Final((unsigned char *)digest, &sha); results[0] = digest[0] ^ digest[2] ^ digest[4]; results[1] = digest[1] ^ digest[3]; + + /* + * RFC2289 mandates that we convert SHA1 digest from big-endian to little + * see Appendix A. + */ + results[0] = bswap32(results[0]); + results[1] = bswap32(results[1]); break; } case 4: {