nss-hg: Fix C99'ism so this progresses further.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Feb 15 13:12:41 2016 +0100
Changeset:	aec7723a52e2f6e3722449397134184b4b140daf

Modified Files:
	nss-hg/distinfo
Added Files:
	nss-hg/patches/patch-lib_freebl_chacha20poly1305.c

Log Message:
nss-hg: Fix C99'ism so this progresses further.

Does not finish build though.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aec7723a52e2f6e3722449397134184b4b140daf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 nss-hg/distinfo                                    |  1 +
 nss-hg/patches/patch-lib_freebl_chacha20poly1305.c | 26 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)

diffs:
diff --git a/nss-hg/distinfo b/nss-hg/distinfo
index 7cf0aad..ca8cbe4 100644
--- a/nss-hg/distinfo
+++ b/nss-hg/distinfo
@@ -18,6 +18,7 @@ SHA1 (patch-lib_certhigh_ocsp.c) = 7ac69dfec32d7102757133c28354dc33f762104e
 SHA1 (patch-lib_dbm_src_mktemp.c) = a23cfc9d86a91bf982bb8e27d81fc8f7391bdab8
 SHA1 (patch-lib_freebl_Makefile) = aedfd6f12872bc94256e1c6be4628334f363c2bb
 SHA1 (patch-lib_freebl_blapi.h) = 00e0dcfe1f6a54bffa97c4852f9f9fcb5ab783e1
+SHA1 (patch-lib_freebl_chacha20poly1305.c) = ee99e7c04f628d285f497ae9b172a8a72da7286a
 SHA1 (patch-lib_freebl_config.mk) = ade7f656b900f93f1fdaa036a733529af132d2ca
 SHA1 (patch-lib_freebl_mpi_mpi.c) = 2d358f72da7a1fe9f257716119e5ead5ed7006ed
 SHA1 (patch-lib_freebl_sha-fast-amd64-sun.s) = 6feb56632584f04c5259dcb72e330e13d485b50a
diff --git a/nss-hg/patches/patch-lib_freebl_chacha20poly1305.c b/nss-hg/patches/patch-lib_freebl_chacha20poly1305.c
new file mode 100644
index 0000000..c47e9e1
--- /dev/null
+++ b/nss-hg/patches/patch-lib_freebl_chacha20poly1305.c
@@ -0,0 +1,26 @@
+$NetBSD$
+
+--- lib/freebl/chacha20poly1305.c.orig	2016-02-15 10:09:28.000000000 +0000
++++ lib/freebl/chacha20poly1305.c
+@@ -140,8 +140,8 @@ ChaCha20Poly1305_Seal(const ChaCha20Poly
+     }
+ 
+     PORT_Memset(block, 0, sizeof(block));
+-    // Generate a block of keystream. The first 32 bytes will be the poly1305
+-    // key. The remainder of the block is discarded.
++    /* Generate a block of keystream. The first 32 bytes will be the poly1305
++     * key. The remainder of the block is discarded. */
+     ChaCha20XOR(block, block, sizeof(block), ctx->key, nonce, 0);
+     ChaCha20XOR(output, input, inputLen, ctx->key, nonce, 1);
+ 
+@@ -182,8 +182,8 @@ ChaCha20Poly1305_Open(const ChaCha20Poly
+     }
+ 
+     PORT_Memset(block, 0, sizeof(block));
+-    // Generate a block of keystream. The first 32 bytes will be the poly1305
+-    // key. The remainder of the block is discarded.
++    /* Generate a block of keystream. The first 32 bytes will be the poly1305
++     * key. The remainder of the block is discarded. */
+     ChaCha20XOR(block, block, sizeof(block), ctx->key, nonce, 0);
+     Poly1305Do(tag, ad, adLen, input, ciphertextLen, block);
+     if (NSS_SecureMemcmp(tag, &input[ciphertextLen], ctx->tagLen) != 0) {