pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
nss-hg: adapt for upstream changes.
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Mon Apr 25 14:40:20 2016 +0200
Changeset: 0c87b01f56a3783eef3f47124a6f48494e97d390
Modified Files:
nss-hg/PLIST
nss-hg/distinfo
nss-hg/patches/patch-cmd_fipstest_fipstest.c
nss-hg/patches/patch-cmd_lib_basicutil.c
nss-hg/patches/patch-coreconf_OpenBSD.mk
Log Message:
nss-hg: adapt for upstream changes.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0c87b01f56a3783eef3f47124a6f48494e97d390
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
nss-hg/PLIST | 2 +
nss-hg/distinfo | 6 +-
nss-hg/patches/patch-cmd_fipstest_fipstest.c | 592 +++++++++++++--------------
nss-hg/patches/patch-cmd_lib_basicutil.c | 16 +-
nss-hg/patches/patch-coreconf_OpenBSD.mk | 2 +-
5 files changed, 290 insertions(+), 328 deletions(-)
diffs:
diff --git a/nss-hg/PLIST b/nss-hg/PLIST
index 134df4b..0b33d9c 100644
--- a/nss-hg/PLIST
+++ b/nss-hg/PLIST
@@ -26,6 +26,8 @@ include/nss/nss/key.h
include/nss/nss/keyhi.h
include/nss/nss/keyt.h
include/nss/nss/keythi.h
+include/nss/nss/lowkeyi.h
+include/nss/nss/lowkeyti.h
include/nss/nss/nss.h
include/nss/nss/nssb64.h
include/nss/nss/nssb64t.h
diff --git a/nss-hg/distinfo b/nss-hg/distinfo
index 501bca9..6245a3b 100644
--- a/nss-hg/distinfo
+++ b/nss-hg/distinfo
@@ -3,11 +3,11 @@ $NetBSD: distinfo,v 1.5 2015/03/17 14:28:41 thomasklausner Exp $
SHA1 (nss-3.16.5.tar.gz) = bec488835954698e7b19149a15205db299cd13de
RMD160 (nss-3.16.5.tar.gz) = 19630a0815d69ee5959b562d7849d35d677c6329
Size (nss-3.16.5.tar.gz) = 6429830 bytes
-SHA1 (patch-cmd_fipstest_fipstest.c) = 870488f07e8c061d58c129bad3bb4982d1f08fb4
-SHA1 (patch-cmd_lib_basicutil.c) = 2fb6b8e5212cce352147e7241941d510e8137401
+SHA1 (patch-cmd_fipstest_fipstest.c) = 640b85bcb2254f7661f51caedde4a3a1cdbfbdfe
+SHA1 (patch-cmd_lib_basicutil.c) = cb5c0bc2e87fe815099bdfe7d1913fc919d24cad
SHA1 (patch-cmd_shlibsign_sign.sh) = 9be9719d9e4cc212d9503616a1145b8c68b97a6a
SHA1 (patch-coreconf_DragonFly.mk) = 328c0f3d4f03ab6d0efcfec3461d97da1c3e387a
-SHA1 (patch-coreconf_OpenBSD.mk) = f7e6df8b813d99dd3ee991055c26f7a3df2c5ee8
+SHA1 (patch-coreconf_OpenBSD.mk) = 0c22a08a6024aa7505e8307e598cbd02ac569a88
SHA1 (patch-coreconf_SunOS5.mk) = db81e955db52ccccc2dbdae364449870b9724e15
SHA1 (patch-coreconf_arch.mk) = 5462c0620564a2ad4a0deb9d71c427e8c0d426eb
SHA1 (patch-coreconf_config.mk) = 0fdcd3fea51ea2c250ab88197b79ae2b91f27ef5
diff --git a/nss-hg/patches/patch-cmd_fipstest_fipstest.c b/nss-hg/patches/patch-cmd_fipstest_fipstest.c
index a314d47..9775c90 100644
--- a/nss-hg/patches/patch-cmd_fipstest_fipstest.c
+++ b/nss-hg/patches/patch-cmd_fipstest_fipstest.c
@@ -2,9 +2,9 @@ $NetBSD$
Missing ctype(3) casts.
---- cmd/fipstest/fipstest.c.orig 2016-01-30 10:42:11.000000000 +0000
+--- cmd/fipstest/fipstest.c.orig 2016-04-25 00:47:19.000000000 +0000
+++ cmd/fipstest/fipstest.c
-@@ -127,7 +127,7 @@ from_hex_str(unsigned char *buf, unsigne
+@@ -125,7 +125,7 @@ from_hex_str(unsigned char *buf, unsigne
/* count the hex digits */
nxdigit = 0;
@@ -13,7 +13,7 @@ Missing ctype(3) casts.
/* empty body */
}
if (nxdigit == 0) {
-@@ -335,7 +335,7 @@ tdea_kat_mmt(char *reqfn)
+@@ -333,7 +333,7 @@ tdea_kat_mmt(char *reqfn)
/* NumKeys */
if (strncmp(&buf[0], "NumKeys", 7) == 0) {
i = 7;
@@ -22,7 +22,7 @@ Missing ctype(3) casts.
i++;
}
numKeys = buf[i];
-@@ -359,10 +359,10 @@ tdea_kat_mmt(char *reqfn)
+@@ -357,10 +357,10 @@ tdea_kat_mmt(char *reqfn)
if (numKeys == 0) {
if (strncmp(buf, "KEYs", 4) == 0) {
i = 4;
@@ -30,12 +30,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
- key[j+8] = key[j];
- key[j+16] = key[j];
-@@ -374,10 +374,10 @@ tdea_kat_mmt(char *reqfn)
+ key[j + 8] = key[j];
+ key[j + 16] = key[j];
+@@ -372,10 +372,10 @@ tdea_kat_mmt(char *reqfn)
/* KEY1 = ... */
if (strncmp(buf, "KEY1", 4) == 0) {
i = 4;
@@ -43,12 +43,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
}
fputs(buf, resp);
-@@ -386,10 +386,10 @@ tdea_kat_mmt(char *reqfn)
+@@ -384,10 +384,10 @@ tdea_kat_mmt(char *reqfn)
/* KEY2 = ... */
if (strncmp(buf, "KEY2", 4) == 0) {
i = 4;
@@ -56,12 +56,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=8; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=8; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 8; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 8; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
}
fputs(buf, resp);
-@@ -398,10 +398,10 @@ tdea_kat_mmt(char *reqfn)
+@@ -396,10 +396,10 @@ tdea_kat_mmt(char *reqfn)
/* KEY3 = ... */
if (strncmp(buf, "KEY3", 4) == 0) {
i = 4;
@@ -69,12 +69,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=16; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=16; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 16; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 16; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
}
fputs(buf, resp);
-@@ -413,7 +413,7 @@ tdea_kat_mmt(char *reqfn)
+@@ -411,7 +411,7 @@ tdea_kat_mmt(char *reqfn)
if (strncmp(buf, "IV", 2) == 0) {
mode = NSS_DES_EDE3_CBC;
i = 2;
@@ -82,8 +82,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<sizeof iv; i+=2,j++) {
-@@ -430,10 +430,10 @@ tdea_kat_mmt(char *reqfn)
+ for (j = 0; j < sizeof iv; i += 2, j++) {
+@@ -428,10 +428,10 @@ tdea_kat_mmt(char *reqfn)
goto loser;
}
i = 9;
@@ -91,25 +91,25 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &plaintext[j]);
}
plaintextlen = j;
-@@ -460,10 +460,10 @@ tdea_kat_mmt(char *reqfn)
+@@ -458,10 +458,10 @@ tdea_kat_mmt(char *reqfn)
}
-
+
i = 10;
- while (isspace(buf[i]) || buf[i] == '=') {
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &ciphertext[j]);
}
ciphertextlen = j;
-@@ -770,7 +770,7 @@ tdea_mct(int mode, char *reqfn)
+@@ -776,7 +776,7 @@ tdea_mct(int mode, char *reqfn)
/* NumKeys */
if (strncmp(&buf[0], "NumKeys", 7) == 0) {
i = 7;
@@ -118,7 +118,7 @@ Missing ctype(3) casts.
i++;
}
numKeys = atoi(&buf[i]);
-@@ -779,10 +779,10 @@ tdea_mct(int mode, char *reqfn)
+@@ -785,10 +785,10 @@ tdea_mct(int mode, char *reqfn)
/* KEY1 = ... */
if (strncmp(buf, "KEY1", 4) == 0) {
i = 4;
@@ -126,12 +126,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
}
continue;
-@@ -790,10 +790,10 @@ tdea_mct(int mode, char *reqfn)
+@@ -796,10 +796,10 @@ tdea_mct(int mode, char *reqfn)
/* KEY2 = ... */
if (strncmp(buf, "KEY2", 4) == 0) {
i = 4;
@@ -139,12 +139,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=8; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=8; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 8; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 8; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
}
continue;
-@@ -801,10 +801,10 @@ tdea_mct(int mode, char *reqfn)
+@@ -807,10 +807,10 @@ tdea_mct(int mode, char *reqfn)
/* KEY3 = ... */
if (strncmp(buf, "KEY3", 4) == 0) {
i = 4;
@@ -152,12 +152,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=16; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=16; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 16; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 16; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
}
continue;
-@@ -813,7 +813,7 @@ tdea_mct(int mode, char *reqfn)
+@@ -819,7 +819,7 @@ tdea_mct(int mode, char *reqfn)
/* IV = ... */
if (strncmp(buf, "IV", 2) == 0) {
i = 2;
@@ -165,8 +165,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<sizeof iv; i+=2,j++) {
-@@ -831,7 +831,7 @@ tdea_mct(int mode, char *reqfn)
+ for (j = 0; j < sizeof iv; i += 2, j++) {
+@@ -837,7 +837,7 @@ tdea_mct(int mode, char *reqfn)
}
/* PT[0] = PT */
i = 9;
@@ -174,8 +174,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<sizeof plaintext; i+=2,j++) {
-@@ -854,10 +854,10 @@ tdea_mct(int mode, char *reqfn)
+ for (j = 0; j < sizeof plaintext; i += 2, j++) {
+@@ -860,10 +860,10 @@ tdea_mct(int mode, char *reqfn)
}
/* CT[0] = CT */
i = 10;
@@ -183,12 +183,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &ciphertext[j]);
}
-
-@@ -1063,10 +1063,10 @@ aes_gcm(char *reqfn, int encrypt)
+
+@@ -1068,10 +1068,10 @@ aes_gcm(char *reqfn, int encrypt)
/* KEY = ... */
if (strncmp(buf, "Key", 3) == 0) {
i = 3;
@@ -196,12 +196,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
}
keysize = j;
-@@ -1076,7 +1076,7 @@ aes_gcm(char *reqfn, int encrypt)
+@@ -1081,7 +1081,7 @@ aes_gcm(char *reqfn, int encrypt)
/* IV = ... */
if (strncmp(buf, "IV", 2) == 0) {
i = 2;
@@ -209,8 +209,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<sizeof iv; i+=2,j++) {
-@@ -1093,10 +1093,10 @@ aes_gcm(char *reqfn, int encrypt)
+ for (j = 0; j < sizeof iv; i += 2, j++) {
+@@ -1098,10 +1098,10 @@ aes_gcm(char *reqfn, int encrypt)
}
i = 2;
@@ -218,12 +218,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &plaintext[j]);
}
plaintextlen = j;
-@@ -1111,10 +1111,10 @@ aes_gcm(char *reqfn, int encrypt)
+@@ -1116,10 +1116,10 @@ aes_gcm(char *reqfn, int encrypt)
}
i = 2;
@@ -231,12 +231,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &ciphertext[j]);
}
ciphertextlen = j;
-@@ -1123,10 +1123,10 @@ aes_gcm(char *reqfn, int encrypt)
+@@ -1128,10 +1128,10 @@ aes_gcm(char *reqfn, int encrypt)
}
if (strncmp(buf, "AAD", 3) == 0) {
i = 3;
@@ -244,12 +244,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &aad[j]);
}
aadlen = j;
-@@ -1175,10 +1175,10 @@ aes_gcm(char *reqfn, int encrypt)
+@@ -1180,10 +1180,10 @@ aes_gcm(char *reqfn, int encrypt)
}
i = 3;
@@ -257,12 +257,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
- hex_to_byteval(&buf[i], &ciphertext[j+ciphertextlen]);
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
+ hex_to_byteval(&buf[i], &ciphertext[j + ciphertextlen]);
}
ciphertextlen += j;
-@@ -1274,10 +1274,10 @@ aes_kat_mmt(char *reqfn)
+@@ -1279,10 +1279,10 @@ aes_kat_mmt(char *reqfn)
/* KEY = ... */
if (strncmp(buf, "KEY", 3) == 0) {
i = 3;
@@ -270,12 +270,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
}
keysize = j;
-@@ -1288,7 +1288,7 @@ aes_kat_mmt(char *reqfn)
+@@ -1293,7 +1293,7 @@ aes_kat_mmt(char *reqfn)
if (strncmp(buf, "IV", 2) == 0) {
mode = NSS_AES_CBC;
i = 2;
@@ -283,8 +283,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<sizeof iv; i+=2,j++) {
-@@ -1305,10 +1305,10 @@ aes_kat_mmt(char *reqfn)
+ for (j = 0; j < sizeof iv; i += 2, j++) {
+@@ -1310,10 +1310,10 @@ aes_kat_mmt(char *reqfn)
}
i = 9;
@@ -292,12 +292,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &plaintext[j]);
}
plaintextlen = j;
-@@ -1336,10 +1336,10 @@ aes_kat_mmt(char *reqfn)
+@@ -1344,10 +1344,10 @@ aes_kat_mmt(char *reqfn)
}
i = 10;
@@ -305,12 +305,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &ciphertext[j]);
}
ciphertextlen = j;
-@@ -1472,10 +1472,10 @@ aes_ecb_mct(char *reqfn)
+@@ -1483,10 +1483,10 @@ aes_ecb_mct(char *reqfn)
if (strncmp(buf, "KEY", 3) == 0) {
/* Key[0] = Key */
i = 3;
@@ -318,12 +318,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
}
keysize = j;
-@@ -1489,7 +1489,7 @@ aes_ecb_mct(char *reqfn)
+@@ -1500,7 +1500,7 @@ aes_ecb_mct(char *reqfn)
}
/* PT[0] = PT */
i = 9;
@@ -331,8 +331,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<sizeof plaintext; i+=2,j++) {
-@@ -1587,10 +1587,10 @@ aes_ecb_mct(char *reqfn)
+ for (j = 0; j < sizeof plaintext; i += 2, j++) {
+@@ -1598,10 +1598,10 @@ aes_ecb_mct(char *reqfn)
}
/* CT[0] = CT */
i = 10;
@@ -340,12 +340,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &ciphertext[j]);
}
-@@ -1757,10 +1757,10 @@ aes_cbc_mct(char *reqfn)
+@@ -1768,10 +1768,10 @@ aes_cbc_mct(char *reqfn)
if (strncmp(buf, "KEY", 3) == 0) {
/* Key[0] = Key */
i = 3;
@@ -353,12 +353,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &key[j]);
}
keysize = j;
-@@ -1770,7 +1770,7 @@ aes_cbc_mct(char *reqfn)
+@@ -1781,7 +1781,7 @@ aes_cbc_mct(char *reqfn)
if (strncmp(buf, "IV", 2) == 0) {
/* IV[0] = IV */
i = 2;
@@ -366,8 +366,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<sizeof iv; i+=2,j++) {
-@@ -1786,7 +1786,7 @@ aes_cbc_mct(char *reqfn)
+ for (j = 0; j < sizeof iv; i += 2, j++) {
+@@ -1797,7 +1797,7 @@ aes_cbc_mct(char *reqfn)
}
/* PT[0] = PT */
i = 9;
@@ -375,8 +375,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<sizeof plaintext; i+=2,j++) {
-@@ -1898,10 +1898,10 @@ aes_cbc_mct(char *reqfn)
+ for (j = 0; j < sizeof plaintext; i += 2, j++) {
+@@ -1909,10 +1909,10 @@ aes_cbc_mct(char *reqfn)
}
/* CT[0] = CT */
i = 10;
@@ -384,30 +384,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &ciphertext[j]);
}
-@@ -2373,7 +2373,7 @@ ecdsa_keypair_test(char *reqfn)
-
- src = &buf[1];
- dst = &curve[4];
-- *dst++ = tolower(*src);
-+ *dst++ = tolower((unsigned char)*src);
- src += 2; /* skip the hyphen */
- *dst++ = *src++;
- *dst++ = *src++;
-@@ -2484,7 +2484,7 @@ ecdsa_pkv_test(char *reqfn)
-
- src = &buf[1];
- dst = &curve[4];
-- *dst++ = tolower(*src);
-+ *dst++ = tolower((unsigned char)*src);
- src += 2; /* skip the hyphen */
- *dst++ = *src++;
- *dst++ = *src++;
-@@ -2521,7 +2521,7 @@ ecdsa_pkv_test(char *reqfn)
+@@ -2535,7 +2535,7 @@ ecdsa_pkv_test(char *reqfn)
if (strncmp(buf, "Qx", 2) == 0) {
fputs(buf, ecdsaresp);
i = 2;
@@ -416,7 +398,7 @@ Missing ctype(3) casts.
i++;
}
keyvalid = from_hex_str(&pubkey.data[1], len, &buf[i]);
-@@ -2535,7 +2535,7 @@ ecdsa_pkv_test(char *reqfn)
+@@ -2549,7 +2549,7 @@ ecdsa_pkv_test(char *reqfn)
continue;
}
i = 2;
@@ -424,17 +406,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- keyvalid = from_hex_str(&pubkey.data[1+len], len, &buf[i]);
-@@ -2609,7 +2609,7 @@ ecdsa_siggen_test(char *reqfn)
-
- src = &buf[1];
- dst = &curve[4];
-- *dst++ = tolower(*src);
-+ *dst++ = tolower((unsigned char)*src);
- src += 2; /* skip the hyphen */
- *dst++ = *src++;
- *dst++ = *src++;
-@@ -2653,10 +2653,10 @@ ecdsa_siggen_test(char *reqfn)
+ keyvalid = from_hex_str(&pubkey.data[1 + len], len, &buf[i]);
+@@ -2667,10 +2667,10 @@ ecdsa_siggen_test(char *reqfn)
ECPrivateKey *ecpriv;
i = 3;
@@ -442,21 +415,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &msg[j]);
}
msglen = j;
-@@ -2779,7 +2779,7 @@ ecdsa_sigver_test(char *reqfn)
-
- src = &buf[1];
- dst = &curve[4];
-- *dst++ = tolower(*src);
-+ *dst++ = tolower((unsigned char)*src);
- src += 2; /* skip the hyphen */
- *dst++ = *src++;
- *dst++ = *src++;
-@@ -2843,10 +2843,10 @@ ecdsa_sigver_test(char *reqfn)
+@@ -2857,10 +2857,10 @@ ecdsa_sigver_test(char *reqfn)
/* Msg = ... */
if (strncmp(buf, "Msg", 3) == 0) {
i = 3;
@@ -464,12 +428,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &msg[j]);
}
msglen = j;
-@@ -2871,7 +2871,7 @@ ecdsa_sigver_test(char *reqfn)
+@@ -2885,7 +2885,7 @@ ecdsa_sigver_test(char *reqfn)
if (strncmp(buf, "Qx", 2) == 0) {
fputs(buf, ecdsaresp);
i = 2;
@@ -478,7 +442,7 @@ Missing ctype(3) casts.
i++;
}
keyvalid = from_hex_str(&ecpub.publicValue.data[1], flen,
-@@ -2885,7 +2885,7 @@ ecdsa_sigver_test(char *reqfn)
+@@ -2899,7 +2899,7 @@ ecdsa_sigver_test(char *reqfn)
continue;
}
i = 2;
@@ -486,8 +450,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- keyvalid = from_hex_str(&ecpub.publicValue.data[1+flen], flen,
-@@ -2907,7 +2907,7 @@ ecdsa_sigver_test(char *reqfn)
+ keyvalid = from_hex_str(&ecpub.publicValue.data[1 + flen], flen,
+@@ -2921,7 +2921,7 @@ ecdsa_sigver_test(char *reqfn)
if (buf[0] == 'R') {
fputs(buf, ecdsaresp);
i = 1;
@@ -496,7 +460,7 @@ Missing ctype(3) casts.
i++;
}
sigvalid = from_hex_str(sig, olen, &buf[i]);
-@@ -2917,7 +2917,7 @@ ecdsa_sigver_test(char *reqfn)
+@@ -2931,7 +2931,7 @@ ecdsa_sigver_test(char *reqfn)
if (buf[0] == 'S') {
fputs(buf, ecdsaresp);
i = 1;
@@ -505,39 +469,39 @@ Missing ctype(3) casts.
i++;
}
if (sigvalid) {
-@@ -2949,7 +2949,7 @@ loser:
+@@ -2963,7 +2963,7 @@ loser:
PRBool
isblankline(char *b)
{
-- while (isspace(*b)) b++;
-+ while (isspace((unsigned char)*b)) b++;
- if ((*b == '\n') || (*b == 0)) {
+- while (isspace(*b))
++ while (isspace((unsigned char)*b))
+ b++;
+ if ((*b == '\n') || (*b == 0)) {
return PR_TRUE;
- }
-@@ -3104,7 +3104,7 @@ drbg(char *reqfn)
- if (strncmp(buf, "[PredictionResistance", 21) == 0) {
+@@ -3122,7 +3122,7 @@ drbg(char *reqfn)
+ if (strncmp(buf, "[PredictionResistance", 21) == 0) {
#ifdef HANDLE_PREDICTION_RESISTANCE
i = 21;
- while (isspace(buf[i]) || buf[i] == '=') {
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
- }
+ }
if (strncmp(buf, "False", 5) == 0) {
-@@ -3237,11 +3237,11 @@ drbg(char *reqfn)
+@@ -3255,11 +3255,11 @@ drbg(char *reqfn)
if (entropyInput) {
memset(entropyInput, 0, entropyInputLen);
i = 18;
- while (isspace(buf[i]) || buf[i] == '=') {
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
- }
-
-- for (j=0; isxdigit(buf[i]); i+=2,j++) { /*j<entropyInputLen*/
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) { /*j<entropyInputLen*/
+ }
+
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) { /*j<entropyInputLen*/
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) { /*j<entropyInputLen*/
hex_to_byteval(&buf[i], &entropyInput[j]);
- }
+ }
}
-@@ -3254,10 +3254,10 @@ drbg(char *reqfn)
+@@ -3272,10 +3272,10 @@ drbg(char *reqfn)
if (additionalInput) {
memset(additionalInput, 0, additionalInputLen);
i = 21;
@@ -545,12 +509,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) { /*j<additionalInputLen*/
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) { /*j<additionalInputLen*/
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) { /*j<additionalInputLen*/
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) { /*j<additionalInputLen*/
hex_to_byteval(&buf[i], &additionalInput[j]);
- }
+ }
}
-@@ -3269,10 +3269,10 @@ drbg(char *reqfn)
+@@ -3287,10 +3287,10 @@ drbg(char *reqfn)
/* Entropy input = ... */
if (strncmp(buf, "EntropyInput", 12) == 0) {
i = 12;
@@ -558,12 +522,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) { /*j<entropyInputLen*/
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) { /*j<entropyInputLen*/
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) { /*j<entropyInputLen*/
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) { /*j<entropyInputLen*/
hex_to_byteval(&buf[i], &entropyInput[j]);
- }
+ }
fputs(buf, rngresp);
-@@ -3282,10 +3282,10 @@ drbg(char *reqfn)
+@@ -3300,10 +3300,10 @@ drbg(char *reqfn)
/* nouce = ... */
if (strncmp(buf, "Nonce", 5) == 0) {
i = 5;
@@ -571,12 +535,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) { /*j<nonceLen*/
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) { /*j<nonceLen*/
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) { /*j<nonceLen*/
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) { /*j<nonceLen*/
hex_to_byteval(&buf[i], &nonce[j]);
- }
+ }
fputs(buf, rngresp);
-@@ -3296,10 +3296,10 @@ drbg(char *reqfn)
+@@ -3314,10 +3314,10 @@ drbg(char *reqfn)
if (strncmp(buf, "PersonalizationString", 21) == 0) {
if (personalizationString) {
i = 21;
@@ -584,12 +548,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) { /*j<personalizationStringLen*/
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) { /*j<personalizationStringLen*/
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) { /*j<personalizationStringLen*/
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) { /*j<personalizationStringLen*/
hex_to_byteval(&buf[i], &personalizationString[j]);
}
}
-@@ -3312,10 +3312,10 @@ drbg(char *reqfn)
+@@ -3330,7 +3330,7 @@ drbg(char *reqfn)
if (strncmp(buf, "AdditionalInput", 15) == 0) {
if (additionalInput) {
i = 15;
@@ -597,12 +561,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) { /*j<additionalInputLen*/
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) { /*j<additionalInputLen*/
- hex_to_byteval(&buf[i], &additionalInput[j]);
- }
- }
-@@ -3332,10 +3332,10 @@ drbg(char *reqfn)
+ for (j = 0; isxdigit(buf[i]); i += 2, j++) { /*j<additionalInputLen*/
+@@ -3350,10 +3350,10 @@ drbg(char *reqfn)
/* Returned bits = ... */
if (strncmp(buf, "ReturnedBits", 12) == 0) {
i = 12;
@@ -610,12 +570,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) { /*j<additionalInputLen*/
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) { /*j<additionalInputLen*/
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) { /*j<additionalInputLen*/
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) { /*j<additionalInputLen*/
hex_to_byteval(&buf[i], &predictedreturn_bytes[j]);
- }
+ }
-@@ -3416,7 +3416,7 @@ rng_vst(char *reqfn)
+@@ -3452,7 +3452,7 @@ rng_vst(char *reqfn)
/* Q = ... */
if (buf[0] == 'Q') {
i = 1;
@@ -623,8 +583,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<sizeof Q; i+=2,j++) {
-@@ -3438,7 +3438,7 @@ rng_vst(char *reqfn)
+ for (j = 0; j < sizeof Q; i += 2, j++) {
+@@ -3474,7 +3474,7 @@ rng_vst(char *reqfn)
/* b = ... */
if (buf[0] == 'b') {
i = 1;
@@ -633,7 +593,7 @@ Missing ctype(3) casts.
i++;
}
b = atoi(&buf[i]);
-@@ -3451,7 +3451,7 @@ rng_vst(char *reqfn)
+@@ -3487,7 +3487,7 @@ rng_vst(char *reqfn)
/* XKey = ... */
if (strncmp(buf, "XKey", 4) == 0) {
i = 4;
@@ -641,8 +601,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<b/8; i+=2,j++) {
-@@ -3463,7 +3463,7 @@ rng_vst(char *reqfn)
+ for (j = 0; j < b / 8; i += 2, j++) {
+@@ -3499,7 +3499,7 @@ rng_vst(char *reqfn)
/* XSeed = ... */
if (strncmp(buf, "XSeed", 5) == 0) {
i = 5;
@@ -650,44 +610,44 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<b/8; i+=2,j++) {
-@@ -3539,7 +3539,7 @@ rng_mct(char *reqfn)
- /* Q = ... */
- if (buf[0] == 'Q') {
- i = 1;
-- while (isspace(buf[i]) || buf[i] == '=') {
-+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
- i++;
- }
- for (j=0; j<sizeof Q; i+=2,j++) {
-@@ -3561,7 +3561,7 @@ rng_mct(char *reqfn)
- /* b = ... */
- if (buf[0] == 'b') {
- i = 1;
-- while (isspace(buf[i]) || buf[i] == '=') {
-+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
- i++;
- }
- b = atoi(&buf[i]);
-@@ -3574,7 +3574,7 @@ rng_mct(char *reqfn)
- /* XKey = ... */
- if (strncmp(buf, "XKey", 4) == 0) {
- i = 4;
-- while (isspace(buf[i]) || buf[i] == '=') {
-+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
- i++;
- }
- for (j=0; j<b/8; i+=2,j++) {
-@@ -3587,7 +3587,7 @@ rng_mct(char *reqfn)
- if (strncmp(buf, "XSeed", 5) == 0) {
- unsigned int k;
- i = 5;
-- while (isspace(buf[i]) || buf[i] == '=') {
-+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
- i++;
- }
- for (j=0; j<b/8; i+=2,j++) {
-@@ -3736,7 +3736,7 @@ void sha_test(char *reqfn)
+ for (j = 0; j < b / 8; i += 2, j++) {
+@@ -3575,7 +3575,7 @@ rng_mct(char *reqfn)
+ /* Q = ... */
+ if (buf[0] == 'Q') {
+ i = 1;
+- while (isspace(buf[i]) || buf[i] == '=') {
++ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
+ i++;
+ }
+ for (j = 0; j < sizeof Q; i += 2, j++) {
+@@ -3597,7 +3597,7 @@ rng_mct(char *reqfn)
+ /* b = ... */
+ if (buf[0] == 'b') {
+ i = 1;
+- while (isspace(buf[i]) || buf[i] == '=') {
++ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
+ i++;
+ }
+ b = atoi(&buf[i]);
+@@ -3610,7 +3610,7 @@ rng_mct(char *reqfn)
+ /* XKey = ... */
+ if (strncmp(buf, "XKey", 4) == 0) {
+ i = 4;
+- while (isspace(buf[i]) || buf[i] == '=') {
++ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
+ i++;
+ }
+ for (j = 0; j < b / 8; i += 2, j++) {
+@@ -3623,7 +3623,7 @@ rng_mct(char *reqfn)
+ if (strncmp(buf, "XSeed", 5) == 0) {
+ unsigned int k;
+ i = 5;
+- while (isspace(buf[i]) || buf[i] == '=') {
++ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
+ i++;
+ }
+ for (j = 0; j < b / 8; i += 2, j++) {
+@@ -3774,7 +3774,7 @@ sha_test(char *reqfn)
if (buf[0] == '[') {
if (strncmp(&buf[1], "L ", 1) == 0) {
i = 2;
@@ -696,7 +656,7 @@ Missing ctype(3) casts.
i++;
}
MDlen = atoi(&buf[i]);
-@@ -3747,7 +3747,7 @@ void sha_test(char *reqfn)
+@@ -3785,7 +3785,7 @@ sha_test(char *reqfn)
/* Len = Length of the Input Message Length ... */
if (strncmp(buf, "Len", 3) == 0) {
i = 3;
@@ -705,7 +665,7 @@ Missing ctype(3) casts.
i++;
}
if (msg) {
-@@ -3771,7 +3771,7 @@ void sha_test(char *reqfn)
+@@ -3809,7 +3809,7 @@ sha_test(char *reqfn)
/* MSG = ... */
if (strncmp(buf, "Msg", 3) == 0) {
i = 3;
@@ -713,8 +673,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j< msgLen; i+=2,j++) {
-@@ -3795,7 +3795,7 @@ void sha_test(char *reqfn)
+ for (j = 0; j < msgLen; i += 2, j++) {
+@@ -3833,7 +3833,7 @@ sha_test(char *reqfn)
/* Seed = ... */
if (strncmp(buf, "Seed", 4) == 0) {
i = 4;
@@ -722,8 +682,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<sizeof seed; i+=2,j++) {
-@@ -3913,11 +3913,11 @@ void hmac_test(char *reqfn)
+ for (j = 0; j < sizeof seed; i += 2, j++) {
+@@ -3951,11 +3951,11 @@ hmac_test(char *reqfn)
while (fgets(buf, bufSize, req) != NULL) {
if (strncmp(buf, "Mac", 3) == 0) {
i = 3;
@@ -732,12 +692,12 @@ Missing ctype(3) casts.
i++;
}
memset(expectedHMAC, 0, HASH_LENGTH_MAX);
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &expectedHMAC[j]);
}
if (memcmp(HMAC, expectedHMAC, TLen) != 0) {
-@@ -3943,7 +3943,7 @@ void hmac_test(char *reqfn)
+@@ -3981,7 +3981,7 @@ hmac_test(char *reqfn)
if (buf[0] == '[') {
if (strncmp(&buf[1], "L ", 1) == 0) {
i = 2;
@@ -746,7 +706,7 @@ Missing ctype(3) casts.
i++;
}
/* HMACLen will get reused for Tlen */
-@@ -3971,7 +3971,7 @@ void hmac_test(char *reqfn)
+@@ -4009,7 +4009,7 @@ hmac_test(char *reqfn)
/* KLen = Length of the Input Secret Key ... */
if (strncmp(buf, "Klen", 4) == 0) {
i = 4;
@@ -755,7 +715,7 @@ Missing ctype(3) casts.
i++;
}
keyLen = atoi(&buf[i]); /* in bytes */
-@@ -3981,7 +3981,7 @@ void hmac_test(char *reqfn)
+@@ -4019,7 +4019,7 @@ hmac_test(char *reqfn)
/* key = the secret key for the key to MAC */
if (strncmp(buf, "Key", 3) == 0) {
i = 3;
@@ -763,8 +723,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j< keyLen; i+=2,j++) {
-@@ -3992,7 +3992,7 @@ void hmac_test(char *reqfn)
+ for (j = 0; j < keyLen; i += 2, j++) {
+@@ -4030,7 +4030,7 @@ hmac_test(char *reqfn)
/* TLen = Length of the calculated HMAC */
if (strncmp(buf, "Tlen", 4) == 0) {
i = 4;
@@ -773,7 +733,7 @@ Missing ctype(3) casts.
i++;
}
TLen = atoi(&buf[i]); /* in bytes */
-@@ -4002,7 +4002,7 @@ void hmac_test(char *reqfn)
+@@ -4040,7 +4040,7 @@ hmac_test(char *reqfn)
/* MSG = to HMAC always 128 bytes for these tests */
if (strncmp(buf, "Msg", 3) == 0) {
i = 3;
@@ -781,8 +741,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j< msgLen; i+=2,j++) {
-@@ -4283,7 +4283,7 @@ dsa_pqgver_test(char *reqfn)
+ for (j = 0; j < msgLen; i += 2, j++) {
+@@ -4320,7 +4320,7 @@ dsa_pqgver_test(char *reqfn)
/* P = ... */
if (buf[0] == 'P') {
i = 1;
@@ -790,8 +750,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j< pqg.prime.len; i+=2,j++) {
-@@ -4297,7 +4297,7 @@ dsa_pqgver_test(char *reqfn)
+ for (j = 0; j < pqg.prime.len; i += 2, j++) {
+@@ -4334,7 +4334,7 @@ dsa_pqgver_test(char *reqfn)
/* Q = ... */
if (buf[0] == 'Q') {
i = 1;
@@ -799,8 +759,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j< pqg.subPrime.len; i+=2,j++) {
-@@ -4315,7 +4315,7 @@ dsa_pqgver_test(char *reqfn)
+ for (j = 0; j < pqg.subPrime.len; i += 2, j++) {
+@@ -4352,7 +4352,7 @@ dsa_pqgver_test(char *reqfn)
SECITEM_ZfreeItem(&pqg.base, PR_FALSE);
}
SECITEM_AllocItem(NULL, &pqg.base, pghSize);
@@ -808,8 +768,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j< pqg.base.len; i+=2,j++) {
-@@ -4337,10 +4337,10 @@ dsa_pqgver_test(char *reqfn)
+ for (j = 0; j < pqg.base.len; i += 2, j++) {
+@@ -4374,10 +4374,10 @@ dsa_pqgver_test(char *reqfn)
i = 0;
}
if (i) {
@@ -817,34 +777,34 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &vfy.seed.data[j]);
}
vfy.seed.len = j;
-@@ -4366,10 +4366,10 @@ dsa_pqgver_test(char *reqfn)
- (strncmp(buf,"qseed",5) == 0))
- {
+@@ -4402,10 +4402,10 @@ dsa_pqgver_test(char *reqfn)
+ if ((strncmp(buf, "pseed", 5) == 0) ||
+ (strncmp(buf, "qseed", 5) == 0)) {
i = 5;
- while (isspace(buf[i]) || buf[i] == '=') {
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=vfy.seed.len; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=vfy.seed.len; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = vfy.seed.len; isxdigit(buf[i]); i += 2, j++) {
++ for (j = vfy.seed.len; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &vfy.seed.data[j]);
}
vfy.seed.len = j;
-@@ -4379,7 +4379,7 @@ dsa_pqgver_test(char *reqfn)
+@@ -4415,7 +4415,7 @@ dsa_pqgver_test(char *reqfn)
}
if (strncmp(buf, "index", 4) == 0) {
- i=5;
+ i = 5;
- while (isspace(buf[i]) || buf[i] == '=') {
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
hex_to_byteval(&buf[i], &vfy.h.data[0]);
-@@ -4446,10 +4446,10 @@ dsa_pqgver_test(char *reqfn)
+@@ -4482,10 +4482,10 @@ dsa_pqgver_test(char *reqfn)
SECStatus rv, result = SECFailure;
i = 1;
@@ -852,25 +812,25 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &vfy.h.data[j]);
}
vfy.h.len = j;
-@@ -4801,10 +4801,10 @@ dsa_siggen_test(char *reqfn)
- memset(sig, 0, sizeof sig);
+@@ -4834,10 +4834,10 @@ dsa_siggen_test(char *reqfn)
+ memset(sig, 0, sizeof sig);
i = 3;
- while (isspace(buf[i]) || buf[i] == '=') {
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &msg[j]);
}
if (fips_hashBuf(hashType, hashBuf, msg, j) != SECSuccess) {
-@@ -4948,7 +4948,7 @@ dsa_sigver_test(char *reqfn)
+@@ -4979,7 +4979,7 @@ dsa_sigver_test(char *reqfn)
/* P = ... */
if (buf[0] == 'P') {
i = 1;
@@ -879,7 +839,7 @@ Missing ctype(3) casts.
i++;
}
memset(pubkey.params.prime.data, 0, pubkey.params.prime.len);
-@@ -4963,7 +4963,7 @@ dsa_sigver_test(char *reqfn)
+@@ -4994,7 +4994,7 @@ dsa_sigver_test(char *reqfn)
/* Q = ... */
if (buf[0] == 'Q') {
i = 1;
@@ -888,7 +848,7 @@ Missing ctype(3) casts.
i++;
}
memset(pubkey.params.subPrime.data, 0, pubkey.params.subPrime.len);
-@@ -4978,7 +4978,7 @@ dsa_sigver_test(char *reqfn)
+@@ -5009,7 +5009,7 @@ dsa_sigver_test(char *reqfn)
/* G = ... */
if (buf[0] == 'G') {
i = 1;
@@ -897,7 +857,7 @@ Missing ctype(3) casts.
i++;
}
memset(pubkey.params.base.data, 0, pubkey.params.base.len);
-@@ -5001,10 +5001,10 @@ dsa_sigver_test(char *reqfn)
+@@ -5032,10 +5032,10 @@ dsa_sigver_test(char *reqfn)
}
i = 3;
@@ -905,12 +865,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]); i += 2, j++) {
hex_to_byteval(&buf[i], &msg[j]);
}
if (fips_hashBuf(hashType, hashBuf, msg, j) != SECSuccess) {
-@@ -5020,7 +5020,7 @@ dsa_sigver_test(char *reqfn)
+@@ -5051,7 +5051,7 @@ dsa_sigver_test(char *reqfn)
/* Y = ... */
if (buf[0] == 'Y') {
i = 1;
@@ -919,16 +879,16 @@ Missing ctype(3) casts.
i++;
}
memset(pubkey.publicValue.data, 0, pubkey.params.subPrime.len);
-@@ -5036,7 +5036,7 @@ dsa_sigver_test(char *reqfn)
+@@ -5067,7 +5067,7 @@ dsa_sigver_test(char *reqfn)
if (buf[0] == 'R') {
- memset(sig, 0, sizeof sig);
+ memset(sig, 0, sizeof sig);
i = 1;
- while (isspace(buf[i]) || buf[i] == '=') {
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j< pubkey.params.subPrime.len; i+=2,j++) {
-@@ -5055,7 +5055,7 @@ dsa_sigver_test(char *reqfn)
+ for (j = 0; j < pubkey.params.subPrime.len; i += 2, j++) {
+@@ -5086,7 +5086,7 @@ dsa_sigver_test(char *reqfn)
}
i = 1;
@@ -936,17 +896,17 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=pubkey.params.subPrime.len;
-@@ -5312,7 +5312,7 @@ rsa_siggen_test(char *reqfn)
+ for (j = pubkey.params.subPrime.len;
+@@ -5342,7 +5342,7 @@ rsa_siggen_test(char *reqfn)
/* SHAAlg = ... */
if (strncmp(buf, "SHAAlg", 6) == 0) {
- i = 6;
-- while (isspace(buf[i]) || buf[i] == '=') {
-+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
- i++;
- }
- /* set the SHA Algorithm */
-@@ -5360,10 +5360,10 @@ rsa_siggen_test(char *reqfn)
+ i = 6;
+- while (isspace(buf[i]) || buf[i] == '=') {
++ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
+ i++;
+ }
+ /* set the SHA Algorithm */
+@@ -5389,10 +5389,10 @@ rsa_siggen_test(char *reqfn)
memset(rsa_computed_signature, 0, sizeof rsa_computed_signature);
i = 3;
@@ -954,12 +914,12 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
-- for (j=0; isxdigit(buf[i]) && j < sizeof(msg); i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]) && j < sizeof(msg); i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]) && j < sizeof(msg); i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]) && j < sizeof(msg); i += 2, j++) {
hex_to_byteval(&buf[i], &msg[j]);
}
shaLength = fips_hashLen(shaAlg);
-@@ -5491,7 +5491,7 @@ rsa_sigver_test(char *reqfn)
+@@ -5519,7 +5519,7 @@ rsa_sigver_test(char *reqfn)
/* n = ... modulus */
if (buf[0] == 'n') {
i = 1;
@@ -968,16 +928,16 @@ Missing ctype(3) casts.
i++;
}
keyvalid = from_hex_str(&rsaBlapiPublicKey.modulus.data[0],
-@@ -5509,7 +5509,7 @@ rsa_sigver_test(char *reqfn)
+@@ -5537,7 +5537,7 @@ rsa_sigver_test(char *reqfn)
/* SHAAlg = ... */
if (strncmp(buf, "SHAAlg", 6) == 0) {
- i = 6;
-- while (isspace(buf[i]) || buf[i] == '=') {
-+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
- i++;
- }
- /* set the SHA Algorithm */
-@@ -5543,11 +5543,11 @@ rsa_sigver_test(char *reqfn)
+ i = 6;
+- while (isspace(buf[i]) || buf[i] == '=') {
++ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
+ i++;
+ }
+ /* set the SHA Algorithm */
+@@ -5571,11 +5571,11 @@ rsa_sigver_test(char *reqfn)
}
i = 1;
@@ -990,17 +950,17 @@ Missing ctype(3) casts.
+ while (isxdigit((unsigned char)buf[i])) {
hex_to_byteval(&buf[i], &t);
if (t == 0) {
- i+=2;
-@@ -5555,7 +5555,7 @@ rsa_sigver_test(char *reqfn)
+ i += 2;
+@@ -5584,7 +5584,7 @@ rsa_sigver_test(char *reqfn)
}
-
+
/* get the exponent */
-- for (j=0; isxdigit(buf[i]) && j < sizeof data; i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]) && j < sizeof data; i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]) && j < sizeof data; i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]) && j < sizeof data; i += 2, j++) {
hex_to_byteval(&buf[i], &data[j]);
}
-@@ -5582,11 +5582,11 @@ rsa_sigver_test(char *reqfn)
+@@ -5613,11 +5613,11 @@ rsa_sigver_test(char *reqfn)
memset(msg, 0, sizeof msg);
i = 3;
@@ -1009,12 +969,12 @@ Missing ctype(3) casts.
i++;
}
-- for (j=0; isxdigit(buf[i]) && j < sizeof msg; i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]) && j < sizeof msg; i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]) && j < sizeof msg; i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]) && j < sizeof msg; i += 2, j++) {
hex_to_byteval(&buf[i], &msg[j]);
}
-@@ -5618,11 +5618,11 @@ rsa_sigver_test(char *reqfn)
+@@ -5648,11 +5648,11 @@ rsa_sigver_test(char *reqfn)
memset(signature, 0, sizeof(signature));
i = 1;
@@ -1023,12 +983,12 @@ Missing ctype(3) casts.
i++;
}
-- for (j=0; isxdigit(buf[i]) && j < sizeof signature; i+=2,j++) {
-+ for (j=0; isxdigit((unsigned char)buf[i]) && j < sizeof signature; i+=2,j++) {
+- for (j = 0; isxdigit(buf[i]) && j < sizeof signature; i += 2, j++) {
++ for (j = 0; isxdigit((unsigned char)buf[i]) && j < sizeof signature; i += 2, j++) {
hex_to_byteval(&buf[i], &signature[j]);
}
-@@ -5824,7 +5824,7 @@ tls(char *reqfn)
+@@ -5853,7 +5853,7 @@ tls(char *reqfn)
/* pre_master_secret = ... */
if (strncmp(buf, "pre_master_secret", 17) == 0) {
i = 17;
@@ -1036,8 +996,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<pms_len; i+=2,j++) {
-@@ -5836,7 +5836,7 @@ tls(char *reqfn)
+ for (j = 0; j < pms_len; i += 2, j++) {
+@@ -5865,7 +5865,7 @@ tls(char *reqfn)
/* serverHello_random = ... */
if (strncmp(buf, "serverHello_random", 18) == 0) {
i = 18;
@@ -1045,8 +1005,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<SSL3_RANDOM_LENGTH; i+=2,j++) {
-@@ -5848,7 +5848,7 @@ tls(char *reqfn)
+ for (j = 0; j < SSL3_RANDOM_LENGTH; i += 2, j++) {
+@@ -5877,7 +5877,7 @@ tls(char *reqfn)
/* clientHello_random = ... */
if (strncmp(buf, "clientHello_random", 18) == 0) {
i = 18;
@@ -1054,8 +1014,8 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<SSL3_RANDOM_LENGTH; i+=2,j++) {
-@@ -5860,7 +5860,7 @@ tls(char *reqfn)
+ for (j = 0; j < SSL3_RANDOM_LENGTH; i += 2, j++) {
+@@ -5889,7 +5889,7 @@ tls(char *reqfn)
/* server_random = ... */
if (strncmp(buf, "server_random", 13) == 0) {
i = 13;
@@ -1063,13 +1023,13 @@ Missing ctype(3) casts.
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<SSL3_RANDOM_LENGTH; i+=2,j++) {
-@@ -5876,7 +5876,7 @@ tls(char *reqfn)
- CK_OBJECT_HANDLE master_handle;
- CK_OBJECT_HANDLE fake_handle;
+ for (j = 0; j < SSL3_RANDOM_LENGTH; i += 2, j++) {
+@@ -5905,7 +5905,7 @@ tls(char *reqfn)
+ CK_OBJECT_HANDLE master_handle;
+ CK_OBJECT_HANDLE fake_handle;
i = 13;
- while (isspace(buf[i]) || buf[i] == '=') {
+ while (isspace((unsigned char)buf[i]) || buf[i] == '=') {
i++;
}
- for (j=0; j<SSL3_RANDOM_LENGTH; i+=2,j++) {
+ for (j = 0; j < SSL3_RANDOM_LENGTH; i += 2, j++) {
diff --git a/nss-hg/patches/patch-cmd_lib_basicutil.c b/nss-hg/patches/patch-cmd_lib_basicutil.c
index a7b0c8f..1549fb4 100644
--- a/nss-hg/patches/patch-cmd_lib_basicutil.c
+++ b/nss-hg/patches/patch-cmd_lib_basicutil.c
@@ -2,14 +2,14 @@ $NetBSD$
Missing ctype(3) casts.
---- cmd/lib/basicutil.c.orig 2016-01-30 10:42:11.000000000 +0000
+--- cmd/lib/basicutil.c.orig 2016-04-25 00:47:19.000000000 +0000
+++ cmd/lib/basicutil.c
-@@ -676,7 +676,7 @@ SECU_SECItemToHex(const SECItem * item,
- }
-
- static unsigned char nibble(char c) {
+@@ -686,7 +686,7 @@ SECU_SECItemToHex(const SECItem *item, c
+ static unsigned char
+ nibble(char c)
+ {
- c = PORT_Tolower(c);
+ c = PORT_Tolower((unsigned char)c);
- return ( c >= '0' && c <= '9') ? c - '0' :
- ( c >= 'a' && c <= 'f') ? c - 'a' +10 : -1;
- }
+ return (c >= '0' && c <= '9') ? c - '0' :
+ (c >=
+ 'a' &&
diff --git a/nss-hg/patches/patch-coreconf_OpenBSD.mk b/nss-hg/patches/patch-coreconf_OpenBSD.mk
index b29c2f6..b0bec34 100644
--- a/nss-hg/patches/patch-coreconf_OpenBSD.mk
+++ b/nss-hg/patches/patch-coreconf_OpenBSD.mk
@@ -2,7 +2,7 @@ $NetBSD: patch-coreconf_OpenBSD.mk,v 1.2 2014/10/05 20:12:38 thomasklausner Exp
PLIST unification (see nspr)?
---- coreconf/OpenBSD.mk.orig 2016-03-07 12:57:50.000000000 +0000
+--- coreconf/OpenBSD.mk.orig 2016-04-25 00:47:19.000000000 +0000
+++ coreconf/OpenBSD.mk
@@ -24,7 +24,7 @@ OS_LIBS += -pthread
DSO_LDOPTS += -pthread
Home |
Main Index |
Thread Index |
Old Index