d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RFC 2289 requires all hashes be stored in little endian format before

Browse Source 
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
This commit is contained in:
Xin LI 2012-08-10 04:48:58 +00:00
parent cb8b429ed3
commit 9776cb63ad
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=239169
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/opie/libopie/hash.c
View File

@ -17,6 +17,8 @@ you didn't get a copy, you may request one from <license@inner.net>.
$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:

9
contrib/opie/libopie/hashlen.c
View File

@ -14,6 +14,8 @@ you didn't get a copy, you may request one from <license@inner.net>.
$FreeBSD$
*/
#include <sys/endian.h>
#include "opie_cfg.h"
#include "opie.h"
@ -36,6 +38,13 @@ VOIDPTR in AND struct opie_otpkey *out AND int n)
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: {