diff options
| author | agc <agc> | 2015-09-12 02:19:06 +0000 |
|---|---|---|
| committer | agc <agc> | 2015-09-12 02:19:06 +0000 |
| commit | 6b8fb0ef2be1110bcefe583e77bd5841fc43227b (patch) | |
| tree | f14c7ca6f3d41b0d827128d071ed7583a8e279df /security | |
| parent | 4c39baea0e51b69c9b94d9a97fdcd772d62cdbd9 (diff) | |
| download | pkgsrc-6b8fb0ef2be1110bcefe583e77bd5841fc43227b.tar.gz | |
Update netpgpverify to version 20150911.
Changes since previous version (20150901)
+ Apparently, OS X 10.4 does not have an implementation of le32dec().
Instead, unroll the inline function.
Bug report from Sevan - thanks!
Diffstat (limited to 'security')
| -rw-r--r-- | security/netpgpverify/Makefile | 4 | ||||
| -rw-r--r-- | security/netpgpverify/files/rmd160.c | 11 | ||||
| -rw-r--r-- | security/netpgpverify/files/verify.h | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/security/netpgpverify/Makefile b/security/netpgpverify/Makefile index 03e3a2b5e57..4b2e09d2d08 100644 --- a/security/netpgpverify/Makefile +++ b/security/netpgpverify/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2015/09/01 19:38:42 agc Exp $ +# $NetBSD: Makefile,v 1.16 2015/09/12 02:19:06 agc Exp $ -DISTNAME= netpgpverify-20150901 +DISTNAME= netpgpverify-20150911 CATEGORIES= security MASTER_SITES= # empty DISTFILES= # empty diff --git a/security/netpgpverify/files/rmd160.c b/security/netpgpverify/files/rmd160.c index 2bc7fab4f4e..332eeacfb91 100644 --- a/security/netpgpverify/files/rmd160.c +++ b/security/netpgpverify/files/rmd160.c @@ -1,4 +1,4 @@ -/* $NetBSD: rmd160.c,v 1.3 2015/09/01 19:38:42 agc Exp $ */ +/* $NetBSD: rmd160.c,v 1.4 2015/09/12 02:19:06 agc Exp $ */ /* $KAME: rmd160.c,v 1.2 2003/07/25 09:37:55 itojun Exp $ */ /* $OpenBSD: rmd160.c,v 1.3 2001/09/26 21:40:13 markus Exp $ */ /* @@ -168,8 +168,13 @@ netpgpv_RMD160Transform(uint32_t state[5], const u_char block[64]) #else int i; - for (i = 0; i < 16; i++) - x[i] = le32dec(block+i*4); + for (i = 0; i < 16; i++) { + x[i] = (uint32_t)( + (uint32_t)(block[i*4 + 0]) | + (uint32_t)(block[i*4 + 1]) << 8 | + (uint32_t)(block[i*4 + 2]) << 16 | + (uint32_t)(block[i*4 + 3]) << 24); + } #endif a = state[0]; diff --git a/security/netpgpverify/files/verify.h b/security/netpgpverify/files/verify.h index df396018bbe..3c2a8aa9c3b 100644 --- a/security/netpgpverify/files/verify.h +++ b/security/netpgpverify/files/verify.h @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef NETPGP_VERIFY_H_ -#define NETPGP_VERIFY_H_ 20150901 +#define NETPGP_VERIFY_H_ 20150911 #define NETPGPVERIFY_VERSION "netpgpverify portable 20150901" |