Date: Fri, 10 Aug 2012 04:48:58 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r239169 - head/contrib/opie/libopie Message-ID: <201208100448.q7A4mwwc093184@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Fri Aug 10 04:48:58 2012 New Revision: 239169 URL: http://svn.freebsd.org/changeset/base/239169 Log: 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 <arthurmesh gmail com> (with changes) MFC after: 1 week Modified: head/contrib/opie/libopie/hash.c head/contrib/opie/libopie/hashlen.c Modified: head/contrib/opie/libopie/hash.c ============================================================================== --- head/contrib/opie/libopie/hash.c Fri Aug 10 04:48:06 2012 (r239168) +++ head/contrib/opie/libopie/hash.c Fri Aug 10 04:48:58 2012 (r239169) @@ -17,6 +17,8 @@ you didn't get a copy, you may request o $FreeBSD$ */ +#include <sys/endian.h> + #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: head/contrib/opie/libopie/hashlen.c ============================================================================== --- head/contrib/opie/libopie/hashlen.c Fri Aug 10 04:48:06 2012 (r239168) +++ head/contrib/opie/libopie/hashlen.c Fri Aug 10 04:48:58 2012 (r239169) @@ -14,6 +14,8 @@ you didn't get a copy, you may request o $FreeBSD$ */ +#include <sys/endian.h> + #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: {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208100448.q7A4mwwc093184>