Index: head/security/libgcrypt/Makefile =================================================================== --- head/security/libgcrypt/Makefile (revision 408971) +++ head/security/libgcrypt/Makefile (revision 408972) @@ -1,59 +1,58 @@ # $FreeBSD$ PORTNAME= libgcrypt -PORTVERSION= 1.6.4 -PORTREVISION= 4 +PORTVERSION= 1.6.5 CATEGORIES= security MASTER_SITES= GNUPG MAINTAINER= cpm@FreeBSD.org COMMENT= General purpose crypto library based on code used in GnuPG -LICENSE= GPLv2 LGPL21 +LICENSE= GPLv2+ LGPL21+ LICENSE_COMB= multi BUILD_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error RUN_DEPENDS= libgpg-error>=1.8:${PORTSDIR}/security/libgpg-error USES= cpe libtool makeinfo tar:bzip2 CPE_VENDOR= gnupg USE_CSTD= gnu89 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-drng-support --enable-static=yes CONFIGURE_ENV= MAKEINFO="makeinfo --no-split" CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL} USE_LDCONFIG= yes DOCS= AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \ README.GIT THANKS TODO doc/HACKING doc/README.apichanges INFO= gcrypt PORTDOCS= * OPTIONS_DEFINE= DOCS .include .if ${ARCH} == "powerpc" CONFIGURE_ARGS+= --disable-asm .endif post-patch: ${RM} -f ${WRKSRC}/doc/gcrypt.info* ${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S # Fix crash at cipher/salsa20.c module on amd64 .if ${ARCH} == "amd64" && exists(/usr/bin/clang) CFLAGS:= ${CFLAGS:N-O*} -O2 .endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}.so post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR} regression-test: build cd ${WRKSRC} && ${MAKE_CMD} check .include Index: head/security/libgcrypt/distinfo =================================================================== --- head/security/libgcrypt/distinfo (revision 408971) +++ head/security/libgcrypt/distinfo (revision 408972) @@ -1,2 +1,2 @@ -SHA256 (libgcrypt-1.6.4.tar.bz2) = c9bc2c7fe2e5f4ea13b0c74f9d24bcbb1ad889bb39297d8082aebf23f4336026 -SIZE (libgcrypt-1.6.4.tar.bz2) = 2549820 +SHA256 (libgcrypt-1.6.5.tar.bz2) = f49ebc5842d455ae7019def33eb5a014a0f07a2a8353dc3aa50a76fd1dafa924 +SIZE (libgcrypt-1.6.5.tar.bz2) = 2549601 Index: head/security/libgcrypt/files/patch-cipher_salsa20.c =================================================================== --- head/security/libgcrypt/files/patch-cipher_salsa20.c (revision 408971) +++ head/security/libgcrypt/files/patch-cipher_salsa20.c (nonexistent) @@ -1,61 +0,0 @@ ---- cipher/salsa20.c.orig 2016-02-03 17:12:14 UTC -+++ cipher/salsa20.c -@@ -485,7 +485,8 @@ salsa20r12_encrypt_stream (void *context - static const char* - selftest (void) - { -- SALSA20_context_t ctx; -+ byte ctxbuf[sizeof(SALSA20_context_t) + 15]; -+ SALSA20_context_t *ctx; - byte scratch[8+1]; - byte buf[256+64+4]; - int i; -@@ -502,32 +503,35 @@ selftest (void) - static const byte ciphertext_1[] = - { 0xE3, 0xBE, 0x8F, 0xDD, 0x8B, 0xEC, 0xA2, 0xE3}; - -- salsa20_setkey (&ctx, key_1, sizeof key_1); -- salsa20_setiv (&ctx, nonce_1, sizeof nonce_1); -+ /* 16-byte alignment required for amd64 implementation. */ -+ ctx = (SALSA20_context_t *)((uintptr_t)(ctxbuf + 15) & ~(uintptr_t)15); -+ -+ salsa20_setkey (ctx, key_1, sizeof key_1); -+ salsa20_setiv (ctx, nonce_1, sizeof nonce_1); - scratch[8] = 0; -- salsa20_encrypt_stream (&ctx, scratch, plaintext_1, sizeof plaintext_1); -+ salsa20_encrypt_stream (ctx, scratch, plaintext_1, sizeof plaintext_1); - if (memcmp (scratch, ciphertext_1, sizeof ciphertext_1)) - return "Salsa20 encryption test 1 failed."; - if (scratch[8]) - return "Salsa20 wrote too much."; -- salsa20_setkey( &ctx, key_1, sizeof(key_1)); -- salsa20_setiv (&ctx, nonce_1, sizeof nonce_1); -- salsa20_encrypt_stream (&ctx, scratch, scratch, sizeof plaintext_1); -+ salsa20_setkey (ctx, key_1, sizeof(key_1)); -+ salsa20_setiv (ctx, nonce_1, sizeof nonce_1); -+ salsa20_encrypt_stream (ctx, scratch, scratch, sizeof plaintext_1); - if (memcmp (scratch, plaintext_1, sizeof plaintext_1)) - return "Salsa20 decryption test 1 failed."; - - for (i = 0; i < sizeof buf; i++) - buf[i] = i; -- salsa20_setkey (&ctx, key_1, sizeof key_1); -- salsa20_setiv (&ctx, nonce_1, sizeof nonce_1); -+ salsa20_setkey (ctx, key_1, sizeof key_1); -+ salsa20_setiv (ctx, nonce_1, sizeof nonce_1); - /*encrypt*/ - salsa20_encrypt_stream (&ctx, buf, buf, sizeof buf); - /*decrypt*/ -- salsa20_setkey (&ctx, key_1, sizeof key_1); -- salsa20_setiv (&ctx, nonce_1, sizeof nonce_1); -- salsa20_encrypt_stream (&ctx, buf, buf, 1); -- salsa20_encrypt_stream (&ctx, buf+1, buf+1, (sizeof buf)-1-1); -- salsa20_encrypt_stream (&ctx, buf+(sizeof buf)-1, buf+(sizeof buf)-1, 1); -+ salsa20_setkey (ctx, key_1, sizeof key_1); -+ salsa20_setiv (ctx, nonce_1, sizeof nonce_1); -+ salsa20_encrypt_stream (ctx, buf, buf, 1); -+ salsa20_encrypt_stream (ctx, buf+1, buf+1, (sizeof buf)-1-1); -+ salsa20_encrypt_stream (ctx, buf+(sizeof buf)-1, buf+(sizeof buf)-1, 1); - for (i = 0; i < sizeof buf; i++) - if (buf[i] != (byte)i) - return "Salsa20 encryption test 2 failed."; Property changes on: head/security/libgcrypt/files/patch-cipher_salsa20.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/libgcrypt/files/patch-cipher-Makefile.in =================================================================== --- head/security/libgcrypt/files/patch-cipher-Makefile.in (nonexistent) +++ head/security/libgcrypt/files/patch-cipher-Makefile.in (revision 408972) @@ -0,0 +1,23 @@ +--- cipher/Makefile.in.orig 2015-09-08 06:32:11 UTC ++++ cipher/Makefile.in +@@ -818,13 +818,19 @@ uninstall-am: + tags tags-am uninstall uninstall-am + + +-# We need to lower the optimization for this module. ++# We need to lower the optimization for these modules. + tiger.o: $(srcdir)/tiger.c + `echo $(COMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) ` + + tiger.lo: $(srcdir)/tiger.c + `echo $(LTCOMPILE) -c $(srcdir)/tiger.c | $(o_flag_munging) ` + ++salsa20.o: $(srcdir)/salsa20.c ++ `echo $(COMPILE) -c $(srcdir)/salsa20.c | $(o_flag_munging) ` ++ ++salsa20.lo: $(srcdir)/salsa20.c ++ `echo $(LTCOMPILE) -c $(srcdir)/salsa20.c | $(o_flag_munging) ` ++ + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: Property changes on: head/security/libgcrypt/files/patch-cipher-Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/libgcrypt/pkg-plist =================================================================== --- head/security/libgcrypt/pkg-plist (revision 408971) +++ head/security/libgcrypt/pkg-plist (revision 408972) @@ -1,11 +1,11 @@ bin/mpicalc bin/dumpsexp bin/hmac256 bin/libgcrypt-config include/gcrypt.h lib/libgcrypt.a lib/libgcrypt.so lib/libgcrypt.so.20 -lib/libgcrypt.so.20.0.4 +lib/libgcrypt.so.20.0.5 man/man1/hmac256.1.gz share/aclocal/libgcrypt.m4