diff options
58 files changed, 3694 insertions, 5709 deletions
diff --git a/cmd/bltest/blapitest.c b/cmd/bltest/blapitest.c index c94f08add..204814d82 100644 --- a/cmd/bltest/blapitest.c +++ b/cmd/bltest/blapitest.c @@ -3610,7 +3610,7 @@ int main(int argc, char **argv) /* Do FIPS self-test */ if (bltest.commands[cmd_FIPS].activated) { - CK_RV ckrv = sftk_FIPSEntryOK(); + CK_RV ckrv = sftk_fipsPowerUpSelfTest(); fprintf(stdout, "CK_RV: %ld.\n", ckrv); PORT_Free(cipherInfo); if (ckrv == CKR_OK) diff --git a/cmd/fipstest/aes.sh b/cmd/fipstest/aes.sh index 19caf98cf..ae5dd569b 100644 --- a/cmd/fipstest/aes.sh +++ b/cmd/fipstest/aes.sh @@ -1,9 +1,8 @@ #!/bin/sh -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -# + # # A Bourne shell script for running the NIST AES Algorithm Validation Suite # @@ -13,12 +12,6 @@ # directory where the REQUEST (.req) files reside. The script generates the # RESPONSE (.rsp) files in the same directory. -BASEDIR=${1-.} -TESTDIR=${BASEDIR}/AES -COMMAND=${2-run} -REQDIR=${TESTDIR}/req -RSPDIR=${TESTDIR}/resp - cbc_kat_requests=" CBCGFSbox128.req CBCGFSbox192.req @@ -73,40 +66,33 @@ ECBMMT192.req ECBMMT256.req " -if [ ${COMMAND} = "verify" ]; then - for request in $cbc_kat_requests $cbc_mct_requests $cbc_mmt_requests $ecb_kat_requests $ecb_mct_requests $ecb_mmt_requests; do - sh ./validate1.sh ${TESTDIR} $request - done - exit 0 -fi - -for request in $cbc_kat_requests; do +for request in $ecb_kat_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest aes kat cbc ${REQDIR}/$request > ${RSPDIR}/$response + fipstest aes kat ecb $request > $response done -for request in $cbc_mct_requests; do +for request in $ecb_mmt_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest aes mct cbc ${REQDIR}/$request > ${RSPDIR}/$response + fipstest aes mmt ecb $request > $response done -for request in $cbc_mmt_requests; do +for request in $ecb_mct_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest aes mmt cbc ${REQDIR}/$request > ${RSPDIR}/$response + fipstest aes mct ecb $request > $response done -for request in $ecb_kat_requests; do +for request in $cbc_kat_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest aes kat ecb ${REQDIR}/$request > ${RSPDIR}/$response + fipstest aes kat cbc $request > $response done -for request in $ecb_mct_requests; do +for request in $cbc_mmt_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest aes mct ecb ${REQDIR}/$request > ${RSPDIR}/$response + fipstest aes mmt cbc $request > $response done -for request in $ecb_mmt_requests; do +for request in $cbc_mct_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest aes mmt ecb ${REQDIR}/$request > ${RSPDIR}/$response + fipstest aes mct cbc $request > $response done diff --git a/cmd/fipstest/aesgcm.sh b/cmd/fipstest/aesgcm.sh deleted file mode 100644 index 3b4dcf5e4..000000000 --- a/cmd/fipstest/aesgcm.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# A Bourne shell script for running the NIST AES Algorithm Validation Suite -# -# Before you run the script, set your PATH, LD_LIBRARY_PATH, ... environment -# variables appropriately so that the fipstest command and the NSPR and NSS -# shared libraries/DLLs are on the search path. Then run this script in the -# directory where the REQUEST (.req) files reside. The script generates the -# RESPONSE (.rsp) files in the same directory. - -BASEDIR=${1-.} -TESTDIR=${BASEDIR}/AES_GCM -COMMAND=${2-run} -REQDIR=${TESTDIR}/req -RSPDIR=${TESTDIR}/resp - -gcm_decrypt_requests=" -gcmDecrypt128.req -gcmDecrypt192.req -gcmDecrypt256.req -" - -gcm_encrypt_extiv_requests=" -gcmEncryptExtIV128.req -gcmEncryptExtIV192.req -gcmEncryptExtIV256.req -" -gcm_encrypt_intiv_requests=" -" - -#gcm_encrypt_intiv_requests=" -#gcmEncryptIntIV128.req -#gcmEncryptIntIV192.req -#gcmEncryptIntIV256.req -#" - -if [ ${COMMAND} = "verify" ]; then - for request in $gcm_decrypt_requests $gcm_encrypt_extiv_requests; do - sh ./validate1.sh ${TESTDIR} $request ' ' '-e /Reason:/d' - done - for request in $gcm_encrypt_intiv_requests; do - name=`basename $request .req` - echo ">>>>> $name" - fipstest aes gcm decrypt ${RSPDIR}/$name.rsp | grep FAIL - done - exit 0 -fi - -for request in $gcm_decrypt_requests; do - response=`echo $request | sed -e "s/req/rsp/"` - echo $request $response - fipstest aes gcm decrypt ${REQDIR}/$request > ${RSPDIR}/$response -done -for request in $gcm_encrypt_intiv_requests; do - response=`echo $request | sed -e "s/req/rsp/"` - echo $request $response - fipstest aes gcm encrypt_intiv ${REQDIR}/$request > ${RSPDIR}/$response -done -for request in $gcm_encrypt_extiv_requests; do - response=`echo $request | sed -e "s/req/rsp/"` - echo $request $response - fipstest aes gcm encrypt_extiv ${REQDIR}/$request > ${RSPDIR}/$response -done diff --git a/cmd/fipstest/dsa.sh b/cmd/fipstest/dsa.sh index da18e1fa3..54a6ded36 100755 --- a/cmd/fipstest/dsa.sh +++ b/cmd/fipstest/dsa.sh @@ -1,8 +1,8 @@ #!/bin/sh -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # # A Bourne shell script for running the NIST DSA Validation System # @@ -11,61 +11,28 @@ # shared libraries/DLLs are on the search path. Then run this script in the # directory where the REQUEST (.req) files reside. The script generates the # RESPONSE (.rsp) files in the same directory. -BASEDIR=${1-.} -TESTDIR=${BASEDIR}/DSA2 -COMMAND=${2-run} -REQDIR=${TESTDIR}/req -RSPDIR=${TESTDIR}/resp - - -# -# several of the DSA tests do use known answer tests to verify the result. -# in those cases, feed generated tests back into the fipstest tool and -# see if we can verify those value. NOTE: th PQGVer and SigVer tests verify -# the dsa pqgver and dsa sigver functions, so we know they can detect errors -# in those PQGGen and SigGen. Only the KeyPair verify is potentially circular. -# -if [ ${COMMAND} = "verify" ]; then -# verify generated keys - name=KeyPair - echo ">>>>> $name" - fipstest dsa keyver ${RSPDIR}/$name.rsp | grep ^Result.=.F -# verify generated pqg values - name=PQGGen - echo ">>>>> $name" - fipstest dsa pqgver ${RSPDIR}/$name.rsp | grep ^Result.=.F -# verify PQGVer with known answer -# sh ./validate1.sh ${TESTDIR} PQGVer.req ' ' '-e /^Result.=.F/s;.(.*);; -e /^Result.=.P/s;.(.*);;' -# verify signatures - name=SigGen - echo ">>>>> $name" - fipstest dsa sigver ${RSPDIR}/$name.rsp | grep ^Result.=.F -# verify SigVer with known answer - sh ./validate1.sh ${TESTDIR} SigVer.req ' ' '-e /^X.=/d -e /^Result.=.F/s;.(.*);;' - exit 0 -fi request=KeyPair.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest dsa keypair ${REQDIR}/$request > ${RSPDIR}/$response +fipstest dsa keypair $request > $response request=PQGGen.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest dsa pqggen ${REQDIR}/$request > ${RSPDIR}/$response +fipstest dsa pqggen $request > $response -request=PQGVer1863.req +request=PQGVer.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest dsa pqgver ${REQDIR}/$request > ${RSPDIR}/$response +fipstest dsa pqgver $request > $response request=SigGen.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest dsa siggen ${REQDIR}/$request > ${RSPDIR}/$response +fipstest dsa siggen $request > $response request=SigVer.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest dsa sigver ${REQDIR}/$request > ${RSPDIR}/$response +fipstest dsa sigver $request > $response diff --git a/cmd/fipstest/ecdsa.sh b/cmd/fipstest/ecdsa.sh index 9482160cc..3d4f32308 100644 --- a/cmd/fipstest/ecdsa.sh +++ b/cmd/fipstest/ecdsa.sh @@ -1,8 +1,8 @@ #!/bin/sh -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # # A Bourne shell script for running the NIST ECDSA Validation System # @@ -11,50 +11,23 @@ # shared libraries/DLLs are on the search path. Then run this script in the # directory where the REQUEST (.req) files reside. The script generates the # RESPONSE (.rsp) files in the same directory. -BASEDIR=${1-.} -TESTDIR=${BASEDIR}/ECDSA2 -COMMAND=${2-run} -REQDIR=${TESTDIR}/req -RSPDIR=${TESTDIR}/resp - -# -# several of the ECDSA tests do not use known answer tests to verify the result. -# In those cases, feed generated tests back into the fipstest tool and -# see if we can verify those value. NOTE: PQGVer and SigVer tests verify -# the dsa pqgver and dsa sigver functions, so we know they can detect errors -# in those PQGGen and SigGen. Only the KeyPair verify is potentially circular. -# -if [ ${COMMAND} = "verify" ]; then -# verify generated keys - name=KeyPair - echo ">>>>> $name" - fipstest ecdsa keyver ${RSPDIR}/$name.rsp | grep ^Result.=.F - sh ./validate1.sh ${TESTDIR} PKV.req ' ' '-e /^X.=/d -e /^Result.=.F/s;.(.*);; -e /^Result.=.P/s;.(.*);;' -# verify signatures - name=SigGen - echo ">>>>> $name" - fipstest ecdsa sigver ${RSPDIR}/$name.rsp | grep ^Result.=.F -# verify SigVer with known answer - sh ./validate1.sh ${TESTDIR} SigVer.req ' ' '-e /^X.=/d -e /^Result.=.F/s;.(.*);; -e /^Result.=.P/s;.(.*);;' - exit 0 -fi request=KeyPair.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest ecdsa keypair ${REQDIR}/$request > ${RSPDIR}/$response +fipstest ecdsa keypair $request > $response request=PKV.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest ecdsa pkv ${REQDIR}/$request > ${RSPDIR}/$response +fipstest ecdsa pkv $request > $response request=SigGen.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest ecdsa siggen ${REQDIR}/$request > ${RSPDIR}/$response +fipstest ecdsa siggen $request > $response request=SigVer.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest ecdsa sigver ${REQDIR}/$request > ${RSPDIR}/$response +fipstest ecdsa sigver $request > $response diff --git a/cmd/fipstest/fipstest.c b/cmd/fipstest/fipstest.c index 68e4b0232..1561e7377 100644 --- a/cmd/fipstest/fipstest.c +++ b/cmd/fipstest/fipstest.c @@ -17,21 +17,6 @@ #include "hasht.h" #include "lowkeyi.h" #include "softoken.h" -#include "pkcs11t.h" -#define __PASTE(x,y) x##y -#undef CK_PKCS11_FUNCTION_INFO -#undef CK_NEED_ARG_LIST -#define CK_EXTERN extern -#define CK_PKCS11_FUNCTION_INFO(func) \ - CK_RV __PASTE(NS,func) -#define CK_NEED_ARG_LIST 1 -#include "pkcs11f.h" -#undef CK_PKCS11_FUNCTION_INFO -#undef CK_NEED_ARG_LIST -#undef __PASTE -#define SSL3_RANDOM_LENGTH 32 - - #if 0 #include "../../lib/freebl/mpi/mpi.h" @@ -61,18 +46,18 @@ hex_to_byteval(const char *c2, unsigned char *byteval) unsigned char offset; *byteval = 0; for (i=0; i<2; i++) { - if (c2[i] >= '0' && c2[i] <= '9') { - offset = c2[i] - '0'; - *byteval |= offset << 4*(1-i); - } else if (c2[i] >= 'a' && c2[i] <= 'f') { - offset = c2[i] - 'a'; - *byteval |= (offset + 10) << 4*(1-i); - } else if (c2[i] >= 'A' && c2[i] <= 'F') { - offset = c2[i] - 'A'; - *byteval |= (offset + 10) << 4*(1-i); - } else { - return SECFailure; - } + if (c2[i] >= '0' && c2[i] <= '9') { + offset = c2[i] - '0'; + *byteval |= offset << 4*(1-i); + } else if (c2[i] >= 'a' && c2[i] <= 'f') { + offset = c2[i] - 'a'; + *byteval |= (offset + 10) << 4*(1-i); + } else if (c2[i] >= 'A' && c2[i] <= 'F') { + offset = c2[i] - 'A'; + *byteval |= (offset + 10) << 4*(1-i); + } else { + return SECFailure; + } } return SECSuccess; } @@ -83,12 +68,12 @@ byteval_to_hex(unsigned char byteval, char *c2, char a) int i; unsigned char offset; for (i=0; i<2; i++) { - offset = (byteval >> 4*(1-i)) & 0x0f; - if (offset < 10) { - c2[i] = '0' + offset; - } else { - c2[i] = a + offset - 10; - } + offset = (byteval >> 4*(1-i)) & 0x0f; + if (offset < 10) { + c2[i] = '0' + offset; + } else { + c2[i] = a + offset - 10; + } } return SECSuccess; } @@ -98,7 +83,7 @@ to_hex_str(char *str, const unsigned char *buf, unsigned int len) { unsigned int i; for (i=0; i<len; i++) { - byteval_to_hex(buf[i], &str[2*i], 'a'); + byteval_to_hex(buf[i], &str[2*i], 'a'); } str[2*len] = '\0'; } @@ -108,7 +93,7 @@ to_hex_str_cap(char *str, const unsigned char *buf, unsigned int len) { unsigned int i; for (i=0; i<len; i++) { - byteval_to_hex(buf[i], &str[2*i], 'A'); + byteval_to_hex(buf[i], &str[2*i], 'A'); } str[2*len] = '\0'; } @@ -128,41 +113,41 @@ from_hex_str(unsigned char *buf, unsigned int len, const char *str) /* count the hex digits */ nxdigit = 0; for (nxdigit = 0; isxdigit(str[nxdigit]); nxdigit++) { - /* empty body */ + /* empty body */ } if (nxdigit == 0) { - return PR_FALSE; + return PR_FALSE; } if (nxdigit > 2*len) { - /* - * The input hex string is too long, but we allow it if the - * extra digits are leading 0's. - */ - for (j = 0; j < nxdigit-2*len; j++) { - if (str[j] != '0') { - return PR_FALSE; - } - } - /* skip leading 0's */ - str += nxdigit-2*len; - nxdigit = 2*len; + /* + * The input hex string is too long, but we allow it if the + * extra digits are leading 0's. + */ + for (j = 0; j < nxdigit-2*len; j++) { + if (str[j] != '0') { + return PR_FALSE; + } + } + /* skip leading 0's */ + str += nxdigit-2*len; + nxdigit = 2*len; } for (i=0, j=0; i< len; i++) { - if (2*i < 2*len-nxdigit) { - /* Handle a short input as if we padded it with leading 0's. */ - if (2*i+1 < 2*len-nxdigit) { - buf[i] = 0; - } else { - char tmp[2]; - tmp[0] = '0'; - tmp[1] = str[j]; - hex_to_byteval(tmp, &buf[i]); - j++; - } - } else { - hex_to_byteval(&str[j], &buf[i]); - j += 2; - } + if (2*i < 2*len-nxdigit) { + /* Handle a short input as if we padded it with leading 0's. */ + if (2*i+1 < 2*len-nxdigit) { + buf[i] = 0; + } else { + char tmp[2]; + tmp[0] = '0'; + tmp[1] = str[j]; + hex_to_byteval(tmp, &buf[i]); + j++; + } + } else { + hex_to_byteval(&str[j], &buf[i]); + j += 2; + } } return PR_TRUE; } @@ -303,11 +288,11 @@ tdea_kat_mmt(char *reqfn) FILE *req; /* input stream from the REQUEST file */ FILE *resp; /* output stream to the RESPONSE file */ int i, j; - int mode = NSS_DES_EDE3; /* NSS_DES_EDE3 (ECB) or NSS_DES_EDE3_CBC */ + int mode = NSS_DES_EDE3; /* NSS_DES_EDE3 (ECB) or NSS_DES_EDE3_CBC */ int crypt = DECRYPT; /* 1 means encrypt, 0 means decrypt */ unsigned char key[24]; /* TDEA 3 key bundle */ unsigned int numKeys = 0; - unsigned char iv[8]; /* for all modes except ECB */ + unsigned char iv[8]; /* for all modes except ECB */ unsigned char plaintext[8*20]; /* 1 to 20 blocks */ unsigned int plaintextlen; unsigned char ciphertext[8*20]; /* 1 to 20 blocks */ @@ -891,14 +876,14 @@ aes_encrypt_buf( cx = AES_CreateContext(key, iv, mode, PR_TRUE, keysize, 16); if (cx == NULL) { - goto loser; + goto loser; } rv = AES_Encrypt(cx, output, outputlen, maxoutputlen, input, inputlen); if (rv != SECSuccess) { - goto loser; + goto loser; } if (*outputlen != inputlen) { - goto loser; + goto loser; } AES_DestroyContext(cx, PR_TRUE); cx = NULL; @@ -909,26 +894,26 @@ aes_encrypt_buf( */ cx = AES_CreateContext(key, iv, mode, PR_FALSE, keysize, 16); if (cx == NULL) { - goto loser; + goto loser; } rv = AES_Decrypt(cx, doublecheck, &doublechecklen, sizeof doublecheck, - output, *outputlen); + output, *outputlen); if (rv != SECSuccess) { - goto loser; + goto loser; } if (doublechecklen != *outputlen) { - goto loser; + goto loser; } AES_DestroyContext(cx, PR_TRUE); cx = NULL; if (memcmp(doublecheck, input, inputlen) != 0) { - goto loser; + goto loser; } rv = SECSuccess; loser: if (cx != NULL) { - AES_DestroyContext(cx, PR_TRUE); + AES_DestroyContext(cx, PR_TRUE); } return rv; } @@ -948,15 +933,15 @@ aes_decrypt_buf( cx = AES_CreateContext(key, iv, mode, PR_FALSE, keysize, 16); if (cx == NULL) { - goto loser; + goto loser; } rv = AES_Decrypt(cx, output, outputlen, maxoutputlen, - input, inputlen); + input, inputlen); if (rv != SECSuccess) { - goto loser; + goto loser; } if (*outputlen != inputlen) { - goto loser; + goto loser; } AES_DestroyContext(cx, PR_TRUE); cx = NULL; @@ -967,245 +952,29 @@ aes_decrypt_buf( */ cx = AES_CreateContext(key, iv, mode, PR_TRUE, keysize, 16); if (cx == NULL) { - goto loser; + goto loser; } rv = AES_Encrypt(cx, doublecheck, &doublechecklen, sizeof doublecheck, - output, *outputlen); + output, *outputlen); if (rv != SECSuccess) { - goto loser; + goto loser; } if (doublechecklen != *outputlen) { - goto loser; + goto loser; } AES_DestroyContext(cx, PR_TRUE); cx = NULL; if (memcmp(doublecheck, input, inputlen) != 0) { - goto loser; + goto loser; } rv = SECSuccess; loser: if (cx != NULL) { - AES_DestroyContext(cx, PR_TRUE); + AES_DestroyContext(cx, PR_TRUE); } return rv; } -/* - * Perform the AES GCM tests. - * - * reqfn is the pathname of the REQUEST file. - * - * The output RESPONSE file is written to stdout. - */ -void -aes_gcm(char *reqfn, int encrypt) -{ - char buf[512]; /* holds one line from the input REQUEST file. - * needs to be large enough to hold the longest - * line "CIPHERTEXT = <320 hex digits>\n". - */ - FILE *aesreq; /* input stream from the REQUEST file */ - FILE *aesresp; /* output stream to the RESPONSE file */ - int i, j; - unsigned char key[32]; /* 128, 192, or 256 bits */ - unsigned int keysize = 0; - unsigned char iv[128]; /* handle large gcm IV's */ - unsigned char plaintext[10*16]; /* 1 to 10 blocks */ - unsigned int plaintextlen; - unsigned char ciphertext[11*16]; /* 1 to 10 blocks + tag */ - unsigned int ciphertextlen; - unsigned char aad[11*16]; /* 1 to 10 blocks + tag */ - unsigned int aadlen; - unsigned int tagbits; - unsigned int taglen; - unsigned int ivlen; - CK_GCM_PARAMS params; - SECStatus rv; - - aesreq = fopen(reqfn, "r"); - aesresp = stdout; - while (fgets(buf, sizeof buf, aesreq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, aesresp); - continue; - } - /* [ENCRYPT] or [DECRYPT] */ - if (buf[0] == '[') { - if (strncmp(buf, "[Taglen", 7) == 0) { - if (sscanf(buf, "[Taglen = %d]", &tagbits) != 1) { - goto loser; - } - taglen = tagbits/8; - } - if (strncmp(buf, "[IVlen", 6) == 0) { - if (sscanf(buf, "[IVlen = %d]", &ivlen) != 1) { - goto loser; - } - ivlen=ivlen/8; - } - fputs(buf, aesresp); - continue; - } - /* "COUNT = x" begins a new data set */ - if (strncmp(buf, "Count", 5) == 0) { - /* zeroize the variables for the test with this data set */ - memset(key, 0, sizeof key); - keysize = 0; - memset(iv, 0, sizeof iv); - memset(plaintext, 0, sizeof plaintext); - plaintextlen = 0; - memset(ciphertext, 0, sizeof ciphertext); - ciphertextlen = 0; - fputs(buf, aesresp); - continue; - } - /* KEY = ... */ - if (strncmp(buf, "Key", 3) == 0) { - i = 3; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &key[j]); - } - keysize = j; - fputs(buf, aesresp); - continue; - } - /* IV = ... */ - if (strncmp(buf, "IV", 2) == 0) { - i = 2; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<sizeof iv; i+=2,j++) { - hex_to_byteval(&buf[i], &iv[j]); - } - fputs(buf, aesresp); - continue; - } - /* PLAINTEXT = ... */ - if (strncmp(buf, "PT", 2) == 0) { - /* sanity check */ - if (!encrypt) { - goto loser; - } - - i = 2; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &plaintext[j]); - } - plaintextlen = j; - fputs(buf, aesresp); - continue; - } - /* CIPHERTEXT = ... */ - if (strncmp(buf, "CT", 2) == 0) { - /* sanity check */ - if (encrypt) { - goto loser; - } - - i = 2; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &ciphertext[j]); - } - ciphertextlen = j; - fputs(buf, aesresp); - continue; - } - if (strncmp(buf, "AAD", 3) == 0) { - i = 3; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &aad[j]); - } - aadlen = j; - fputs(buf, aesresp); - if (encrypt) { - if (encrypt == 2) { - rv = RNG_GenerateGlobalRandomBytes(iv, ivlen); - if (rv != SECSuccess) { - goto loser; - } - } - params.pIv = iv; - params.ulIvLen = ivlen; - params.pAAD = aad; - params.ulAADLen = aadlen; - params.ulTagBits = tagbits; - rv = aes_encrypt_buf(NSS_AES_GCM, key, keysize, - (unsigned char *)¶ms, - ciphertext, &ciphertextlen, sizeof ciphertext, - plaintext, plaintextlen); - if (rv != SECSuccess) { - goto loser; - } - - if (encrypt == 2) { - fputs("IV = ", aesresp); - to_hex_str(buf, iv, ivlen); - fputs(buf, aesresp); - fputc('\n', aesresp); - } - fputs("CT = ", aesresp); - j = ciphertextlen-taglen; - to_hex_str(buf, ciphertext, j); - fputs(buf, aesresp); - fputs("\nTag = ", aesresp); - to_hex_str(buf, ciphertext+j, taglen); - fputs(buf, aesresp); - fputc('\n', aesresp); - } - continue; - } - if (strncmp(buf, "Tag", 3) == 0) { - /* sanity check */ - if (encrypt) { - goto loser; - } - - i = 3; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &ciphertext[j+ciphertextlen]); - } - ciphertextlen += j; - params.pIv = iv; - params.ulIvLen = ivlen; - params.pAAD = aad; - params.ulAADLen = aadlen; - params.ulTagBits = tagbits; - rv = aes_decrypt_buf(NSS_AES_GCM, key, keysize, - (unsigned char *)¶ms, - plaintext, &plaintextlen, sizeof plaintext, - ciphertext, ciphertextlen); - fputs(buf, aesresp); - if (rv != SECSuccess) { - fprintf(aesresp,"FAIL\n"); - } else { - fputs("PT = ", aesresp); - to_hex_str(buf, plaintext, plaintextlen); - fputs(buf, aesresp); - fputc('\n', aesresp); - } - continue; - } - } -loser: - fclose(aesreq); -} /* * Perform the AES Known Answer Test (KAT) or Multi-block Message @@ -1228,11 +997,11 @@ aes_kat_mmt(char *reqfn) FILE *aesreq; /* input stream from the REQUEST file */ FILE *aesresp; /* output stream to the RESPONSE file */ int i, j; - int mode = NSS_AES; /* NSS_AES (ECB) or NSS_AES_CBC */ + int mode = NSS_AES; /* NSS_AES (ECB) or NSS_AES_CBC */ int encrypt = 0; /* 1 means encrypt, 0 means decrypt */ unsigned char key[32]; /* 128, 192, or 256 bits */ unsigned int keysize = 0; - unsigned char iv[16]; /* for all modes except ECB */ + unsigned char iv[16]; /* for all modes except ECB */ unsigned char plaintext[10*16]; /* 1 to 10 blocks */ unsigned int plaintextlen; unsigned char ciphertext[10*16]; /* 1 to 10 blocks */ @@ -1242,123 +1011,123 @@ aes_kat_mmt(char *reqfn) aesreq = fopen(reqfn, "r"); aesresp = stdout; while (fgets(buf, sizeof buf, aesreq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, aesresp); - continue; - } - /* [ENCRYPT] or [DECRYPT] */ - if (buf[0] == '[') { - if (strncmp(&buf[1], "ENCRYPT", 7) == 0) { - encrypt = 1; - } else { - encrypt = 0; - } - fputs(buf, aesresp); - continue; - } - /* "COUNT = x" begins a new data set */ - if (strncmp(buf, "COUNT", 5) == 0) { - mode = NSS_AES; - /* zeroize the variables for the test with this data set */ - memset(key, 0, sizeof key); - keysize = 0; - memset(iv, 0, sizeof iv); - memset(plaintext, 0, sizeof plaintext); - plaintextlen = 0; - memset(ciphertext, 0, sizeof ciphertext); - ciphertextlen = 0; - fputs(buf, aesresp); - continue; - } - /* KEY = ... */ - if (strncmp(buf, "KEY", 3) == 0) { - i = 3; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &key[j]); - } - keysize = j; - fputs(buf, aesresp); - continue; - } - /* IV = ... */ - if (strncmp(buf, "IV", 2) == 0) { - mode = NSS_AES_CBC; - i = 2; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<sizeof iv; i+=2,j++) { - hex_to_byteval(&buf[i], &iv[j]); - } - fputs(buf, aesresp); - continue; - } - /* PLAINTEXT = ... */ - if (strncmp(buf, "PLAINTEXT", 9) == 0) { - /* sanity check */ - if (!encrypt) { - goto loser; - } + /* a comment or blank line */ + if (buf[0] == '#' || buf[0] == '\n') { + fputs(buf, aesresp); + continue; + } + /* [ENCRYPT] or [DECRYPT] */ + if (buf[0] == '[') { + if (strncmp(&buf[1], "ENCRYPT", 7) == 0) { + encrypt = 1; + } else { + encrypt = 0; + } + fputs(buf, aesresp); + continue; + } + /* "COUNT = x" begins a new data set */ + if (strncmp(buf, "COUNT", 5) == 0) { + mode = NSS_AES; + /* zeroize the variables for the test with this data set */ + memset(key, 0, sizeof key); + keysize = 0; + memset(iv, 0, sizeof iv); + memset(plaintext, 0, sizeof plaintext); + plaintextlen = 0; + memset(ciphertext, 0, sizeof ciphertext); + ciphertextlen = 0; + fputs(buf, aesresp); + continue; + } + /* KEY = ... */ + if (strncmp(buf, "KEY", 3) == 0) { + i = 3; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; isxdigit(buf[i]); i+=2,j++) { + hex_to_byteval(&buf[i], &key[j]); + } + keysize = j; + fputs(buf, aesresp); + continue; + } + /* IV = ... */ + if (strncmp(buf, "IV", 2) == 0) { + mode = NSS_AES_CBC; + i = 2; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; j<sizeof iv; i+=2,j++) { + hex_to_byteval(&buf[i], &iv[j]); + } + fputs(buf, aesresp); + continue; + } + /* PLAINTEXT = ... */ + if (strncmp(buf, "PLAINTEXT", 9) == 0) { + /* sanity check */ + if (!encrypt) { + goto loser; + } - i = 9; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &plaintext[j]); - } - plaintextlen = j; + i = 9; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; isxdigit(buf[i]); i+=2,j++) { + hex_to_byteval(&buf[i], &plaintext[j]); + } + plaintextlen = j; - rv = aes_encrypt_buf(mode, key, keysize, - (mode == NSS_AES) ? NULL : iv, - ciphertext, &ciphertextlen, sizeof ciphertext, - plaintext, plaintextlen); - if (rv != SECSuccess) { - goto loser; - } + rv = aes_encrypt_buf(mode, key, keysize, + (mode == NSS_AES) ? NULL : iv, + ciphertext, &ciphertextlen, sizeof ciphertext, + plaintext, plaintextlen); + if (rv != SECSuccess) { + goto loser; + } - fputs(buf, aesresp); - fputs("CIPHERTEXT = ", aesresp); - to_hex_str(buf, ciphertext, ciphertextlen); - fputs(buf, aesresp); - fputc('\n', aesresp); - continue; - } - /* CIPHERTEXT = ... */ - if (strncmp(buf, "CIPHERTEXT", 10) == 0) { - /* sanity check */ - if (encrypt) { - goto loser; - } + fputs(buf, aesresp); + fputs("CIPHERTEXT = ", aesresp); + to_hex_str(buf, ciphertext, ciphertextlen); + fputs(buf, aesresp); + fputc('\n', aesresp); + continue; + } + /* CIPHERTEXT = ... */ + if (strncmp(buf, "CIPHERTEXT", 10) == 0) { + /* sanity check */ + if (encrypt) { + goto loser; + } - i = 10; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &ciphertext[j]); - } - ciphertextlen = j; + i = 10; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; isxdigit(buf[i]); i+=2,j++) { + hex_to_byteval(&buf[i], &ciphertext[j]); + } + ciphertextlen = j; - rv = aes_decrypt_buf(mode, key, keysize, - (mode == NSS_AES) ? NULL : iv, - plaintext, &plaintextlen, sizeof plaintext, - ciphertext, ciphertextlen); - if (rv != SECSuccess) { - goto loser; - } + rv = aes_decrypt_buf(mode, key, keysize, + (mode == NSS_AES) ? NULL : iv, + plaintext, &plaintextlen, sizeof plaintext, + ciphertext, ciphertextlen); + if (rv != SECSuccess) { + goto loser; + } - fputs(buf, aesresp); - fputs("PLAINTEXT = ", aesresp); - to_hex_str(buf, plaintext, plaintextlen); - fputs(buf, aesresp); - fputc('\n', aesresp); - continue; - } + fputs(buf, aesresp); + fputs("PLAINTEXT = ", aesresp); + to_hex_str(buf, plaintext, plaintextlen); + fputs(buf, aesresp); + fputc('\n', aesresp); + continue; + } } loser: fclose(aesreq); @@ -1376,32 +1145,32 @@ aes_mct_next_key(unsigned char *key, unsigned int keysize, switch (keysize) { case 16: /* 128-bit key */ - /* Key[i+1] = Key[i] xor CT[j] */ - for (k=0; k<16; k++) { - key[k] ^= ciphertext[k]; - } - break; + /* Key[i+1] = Key[i] xor CT[j] */ + for (k=0; k<16; k++) { + key[k] ^= ciphertext[k]; + } + break; case 24: /* 192-bit key */ - /* - * Key[i+1] = Key[i] xor (last 64-bits of - * CT[j-1] || CT[j]) - */ - for (k=0; k<8; k++) { - key[k] ^= ciphertext_1[k+8]; - } - for (k=8; k<24; k++) { - key[k] ^= ciphertext[k-8]; - } - break; + /* + * Key[i+1] = Key[i] xor (last 64-bits of + * CT[j-1] || CT[j]) + */ + for (k=0; k<8; k++) { + key[k] ^= ciphertext_1[k+8]; + } + for (k=8; k<24; k++) { + key[k] ^= ciphertext[k-8]; + } + break; case 32: /* 256-bit key */ - /* Key[i+1] = Key[i] xor (CT[j-1] || CT[j]) */ - for (k=0; k<16; k++) { - key[k] ^= ciphertext_1[k]; - } - for (k=16; k<32; k++) { - key[k] ^= ciphertext[k-16]; - } - break; + /* Key[i+1] = Key[i] xor (CT[j-1] || CT[j]) */ + for (k=0; k<16; k++) { + key[k] ^= ciphertext_1[k]; + } + for (k=16; k<32; k++) { + key[k] ^= ciphertext[k-16]; + } + break; } } @@ -1435,7 +1204,7 @@ aes_ecb_mct(char *reqfn) unsigned char ciphertext_1[16]; /* CT[j-1] */ unsigned char doublecheck[16]; unsigned int outputlen; - AESContext *cx = NULL; /* the operation being tested */ + AESContext *cx = NULL; /* the operation being tested */ AESContext *cx2 = NULL; /* the inverse operation done in parallel * to doublecheck our result. */ @@ -1444,246 +1213,246 @@ aes_ecb_mct(char *reqfn) aesreq = fopen(reqfn, "r"); aesresp = stdout; while (fgets(buf, sizeof buf, aesreq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, aesresp); - continue; - } - /* [ENCRYPT] or [DECRYPT] */ - if (buf[0] == '[') { - if (strncmp(&buf[1], "ENCRYPT", 7) == 0) { - encrypt = 1; - } else { - encrypt = 0; - } - fputs(buf, aesresp); - continue; - } - /* "COUNT = x" begins a new data set */ - if (strncmp(buf, "COUNT", 5) == 0) { - /* zeroize the variables for the test with this data set */ - memset(key, 0, sizeof key); - keysize = 0; - memset(plaintext, 0, sizeof plaintext); - memset(ciphertext, 0, sizeof ciphertext); - continue; - } - /* KEY = ... */ - if (strncmp(buf, "KEY", 3) == 0) { - /* Key[0] = Key */ - i = 3; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &key[j]); - } - keysize = j; - continue; - } - /* PLAINTEXT = ... */ - if (strncmp(buf, "PLAINTEXT", 9) == 0) { - /* sanity check */ - if (!encrypt) { - goto loser; - } - /* PT[0] = PT */ - i = 9; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<sizeof plaintext; i+=2,j++) { - hex_to_byteval(&buf[i], &plaintext[j]); - } - - for (i=0; i<100; i++) { - sprintf(buf, "COUNT = %d\n", i); - fputs(buf, aesresp); - /* Output Key[i] */ - fputs("KEY = ", aesresp); - to_hex_str(buf, key, keysize); - fputs(buf, aesresp); - fputc('\n', aesresp); - /* Output PT[0] */ - fputs("PLAINTEXT = ", aesresp); - to_hex_str(buf, plaintext, sizeof plaintext); - fputs(buf, aesresp); - fputc('\n', aesresp); - - cx = AES_CreateContext(key, NULL, NSS_AES, - PR_TRUE, keysize, 16); - if (cx == NULL) { - goto loser; - } - /* - * doublecheck our result by decrypting the result - * and comparing the output with the plaintext. - */ - cx2 = AES_CreateContext(key, NULL, NSS_AES, - PR_FALSE, keysize, 16); - if (cx2 == NULL) { - goto loser; - } - for (j=0; j<1000; j++) { - /* Save CT[j-1] */ - memcpy(ciphertext_1, ciphertext, sizeof ciphertext); - - /* CT[j] = AES(Key[i], PT[j]) */ - outputlen = 0; - rv = AES_Encrypt(cx, - ciphertext, &outputlen, sizeof ciphertext, - plaintext, sizeof plaintext); - if (rv != SECSuccess) { - goto loser; - } - if (outputlen != sizeof plaintext) { - goto loser; - } - - /* doublecheck our result */ - outputlen = 0; - rv = AES_Decrypt(cx2, - doublecheck, &outputlen, sizeof doublecheck, - ciphertext, sizeof ciphertext); - if (rv != SECSuccess) { - goto loser; - } - if (outputlen != sizeof ciphertext) { - goto loser; - } - if (memcmp(doublecheck, plaintext, sizeof plaintext)) { - goto loser; - } - - /* PT[j+1] = CT[j] */ - memcpy(plaintext, ciphertext, sizeof plaintext); - } - AES_DestroyContext(cx, PR_TRUE); - cx = NULL; - AES_DestroyContext(cx2, PR_TRUE); - cx2 = NULL; - - /* Output CT[j] */ - fputs("CIPHERTEXT = ", aesresp); - to_hex_str(buf, ciphertext, sizeof ciphertext); - fputs(buf, aesresp); - fputc('\n', aesresp); - - /* Key[i+1] = Key[i] xor ... */ - aes_mct_next_key(key, keysize, ciphertext_1, ciphertext); - /* PT[0] = CT[j] */ - /* done at the end of the for(j) loop */ - - fputc('\n', aesresp); - } + /* a comment or blank line */ + if (buf[0] == '#' || buf[0] == '\n') { + fputs(buf, aesresp); + continue; + } + /* [ENCRYPT] or [DECRYPT] */ + if (buf[0] == '[') { + if (strncmp(&buf[1], "ENCRYPT", 7) == 0) { + encrypt = 1; + } else { + encrypt = 0; + } + fputs(buf, aesresp); + continue; + } + /* "COUNT = x" begins a new data set */ + if (strncmp(buf, "COUNT", 5) == 0) { + /* zeroize the variables for the test with this data set */ + memset(key, 0, sizeof key); + keysize = 0; + memset(plaintext, 0, sizeof plaintext); + memset(ciphertext, 0, sizeof ciphertext); + continue; + } + /* KEY = ... */ + if (strncmp(buf, "KEY", 3) == 0) { + /* Key[0] = Key */ + i = 3; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; isxdigit(buf[i]); i+=2,j++) { + hex_to_byteval(&buf[i], &key[j]); + } + keysize = j; + continue; + } + /* PLAINTEXT = ... */ + if (strncmp(buf, "PLAINTEXT", 9) == 0) { + /* sanity check */ + if (!encrypt) { + goto loser; + } + /* PT[0] = PT */ + i = 9; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; j<sizeof plaintext; i+=2,j++) { + hex_to_byteval(&buf[i], &plaintext[j]); + } - continue; - } - /* CIPHERTEXT = ... */ - if (strncmp(buf, "CIPHERTEXT", 10) == 0) { - /* sanity check */ - if (encrypt) { - goto loser; - } - /* CT[0] = CT */ - i = 10; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &ciphertext[j]); - } + for (i=0; i<100; i++) { + sprintf(buf, "COUNT = %d\n", i); + fputs(buf, aesresp); + /* Output Key[i] */ + fputs("KEY = ", aesresp); + to_hex_str(buf, key, keysize); + fputs(buf, aesresp); + fputc('\n', aesresp); + /* Output PT[0] */ + fputs("PLAINTEXT = ", aesresp); + to_hex_str(buf, plaintext, sizeof plaintext); + fputs(buf, aesresp); + fputc('\n', aesresp); + + cx = AES_CreateContext(key, NULL, NSS_AES, + PR_TRUE, keysize, 16); + if (cx == NULL) { + goto loser; + } + /* + * doublecheck our result by decrypting the result + * and comparing the output with the plaintext. + */ + cx2 = AES_CreateContext(key, NULL, NSS_AES, + PR_FALSE, keysize, 16); + if (cx2 == NULL) { + goto loser; + } + for (j=0; j<1000; j++) { + /* Save CT[j-1] */ + memcpy(ciphertext_1, ciphertext, sizeof ciphertext); + + /* CT[j] = AES(Key[i], PT[j]) */ + outputlen = 0; + rv = AES_Encrypt(cx, + ciphertext, &outputlen, sizeof ciphertext, + plaintext, sizeof plaintext); + if (rv != SECSuccess) { + goto loser; + } + if (outputlen != sizeof plaintext) { + goto loser; + } - for (i=0; i<100; i++) { - sprintf(buf, "COUNT = %d\n", i); - fputs(buf, aesresp); - /* Output Key[i] */ - fputs("KEY = ", aesresp); - to_hex_str(buf, key, keysize); - fputs(buf, aesresp); - fputc('\n', aesresp); - /* Output CT[0] */ - fputs("CIPHERTEXT = ", aesresp); - to_hex_str(buf, ciphertext, sizeof ciphertext); - fputs(buf, aesresp); - fputc('\n', aesresp); - - cx = AES_CreateContext(key, NULL, NSS_AES, - PR_FALSE, keysize, 16); - if (cx == NULL) { - goto loser; - } - /* - * doublecheck our result by encrypting the result - * and comparing the output with the ciphertext. - */ - cx2 = AES_CreateContext(key, NULL, NSS_AES, - PR_TRUE, keysize, 16); - if (cx2 == NULL) { - goto loser; - } - for (j=0; j<1000; j++) { - /* Save PT[j-1] */ - memcpy(plaintext_1, plaintext, sizeof plaintext); - - /* PT[j] = AES(Key[i], CT[j]) */ - outputlen = 0; - rv = AES_Decrypt(cx, - plaintext, &outputlen, sizeof plaintext, - ciphertext, sizeof ciphertext); - if (rv != SECSuccess) { - goto loser; - } - if (outputlen != sizeof ciphertext) { - goto loser; - } + /* doublecheck our result */ + outputlen = 0; + rv = AES_Decrypt(cx2, + doublecheck, &outputlen, sizeof doublecheck, + ciphertext, sizeof ciphertext); + if (rv != SECSuccess) { + goto loser; + } + if (outputlen != sizeof ciphertext) { + goto loser; + } + if (memcmp(doublecheck, plaintext, sizeof plaintext)) { + goto loser; + } - /* doublecheck our result */ - outputlen = 0; - rv = AES_Encrypt(cx2, - doublecheck, &outputlen, sizeof doublecheck, - plaintext, sizeof plaintext); - if (rv != SECSuccess) { - goto loser; - } - if (outputlen != sizeof plaintext) { - goto loser; - } - if (memcmp(doublecheck, ciphertext, sizeof ciphertext)) { - goto loser; - } + /* PT[j+1] = CT[j] */ + memcpy(plaintext, ciphertext, sizeof plaintext); + } + AES_DestroyContext(cx, PR_TRUE); + cx = NULL; + AES_DestroyContext(cx2, PR_TRUE); + cx2 = NULL; + + /* Output CT[j] */ + fputs("CIPHERTEXT = ", aesresp); + to_hex_str(buf, ciphertext, sizeof ciphertext); + fputs(buf, aesresp); + fputc('\n', aesresp); + + /* Key[i+1] = Key[i] xor ... */ + aes_mct_next_key(key, keysize, ciphertext_1, ciphertext); + /* PT[0] = CT[j] */ + /* done at the end of the for(j) loop */ + + fputc('\n', aesresp); + } - /* CT[j+1] = PT[j] */ - memcpy(ciphertext, plaintext, sizeof ciphertext); - } - AES_DestroyContext(cx, PR_TRUE); - cx = NULL; - AES_DestroyContext(cx2, PR_TRUE); - cx2 = NULL; + continue; + } + /* CIPHERTEXT = ... */ + if (strncmp(buf, "CIPHERTEXT", 10) == 0) { + /* sanity check */ + if (encrypt) { + goto loser; + } + /* CT[0] = CT */ + i = 10; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; isxdigit(buf[i]); i+=2,j++) { + hex_to_byteval(&buf[i], &ciphertext[j]); + } - /* Output PT[j] */ - fputs("PLAINTEXT = ", aesresp); - to_hex_str(buf, plaintext, sizeof plaintext); - fputs(buf, aesresp); - fputc('\n', aesresp); + for (i=0; i<100; i++) { + sprintf(buf, "COUNT = %d\n", i); + fputs(buf, aesresp); + /* Output Key[i] */ + fputs("KEY = ", aesresp); + to_hex_str(buf, key, keysize); + fputs(buf, aesresp); + fputc('\n', aesresp); + /* Output CT[0] */ + fputs("CIPHERTEXT = ", aesresp); + to_hex_str(buf, ciphertext, sizeof ciphertext); + fputs(buf, aesresp); + fputc('\n', aesresp); + + cx = AES_CreateContext(key, NULL, NSS_AES, + PR_FALSE, keysize, 16); + if (cx == NULL) { + goto loser; + } + /* + * doublecheck our result by encrypting the result + * and comparing the output with the ciphertext. + */ + cx2 = AES_CreateContext(key, NULL, NSS_AES, + PR_TRUE, keysize, 16); + if (cx2 == NULL) { + goto loser; + } + for (j=0; j<1000; j++) { + /* Save PT[j-1] */ + memcpy(plaintext_1, plaintext, sizeof plaintext); + + /* PT[j] = AES(Key[i], CT[j]) */ + outputlen = 0; + rv = AES_Decrypt(cx, + plaintext, &outputlen, sizeof plaintext, + ciphertext, sizeof ciphertext); + if (rv != SECSuccess) { + goto loser; + } + if (outputlen != sizeof ciphertext) { + goto loser; + } - /* Key[i+1] = Key[i] xor ... */ - aes_mct_next_key(key, keysize, plaintext_1, plaintext); - /* CT[0] = PT[j] */ - /* done at the end of the for(j) loop */ + /* doublecheck our result */ + outputlen = 0; + rv = AES_Encrypt(cx2, + doublecheck, &outputlen, sizeof doublecheck, + plaintext, sizeof plaintext); + if (rv != SECSuccess) { + goto loser; + } + if (outputlen != sizeof plaintext) { + goto loser; + } + if (memcmp(doublecheck, ciphertext, sizeof ciphertext)) { + goto loser; + } - fputc('\n', aesresp); - } + /* CT[j+1] = PT[j] */ + memcpy(ciphertext, plaintext, sizeof ciphertext); + } + AES_DestroyContext(cx, PR_TRUE); + cx = NULL; + AES_DestroyContext(cx2, PR_TRUE); + cx2 = NULL; + + /* Output PT[j] */ + fputs("PLAINTEXT = ", aesresp); + to_hex_str(buf, plaintext, sizeof plaintext); + fputs(buf, aesresp); + fputc('\n', aesresp); + + /* Key[i+1] = Key[i] xor ... */ + aes_mct_next_key(key, keysize, plaintext_1, plaintext); + /* CT[0] = PT[j] */ + /* done at the end of the for(j) loop */ + + fputc('\n', aesresp); + } - continue; - } + continue; + } } loser: if (cx != NULL) { - AES_DestroyContext(cx, PR_TRUE); + AES_DestroyContext(cx, PR_TRUE); } if (cx2 != NULL) { - AES_DestroyContext(cx2, PR_TRUE); + AES_DestroyContext(cx2, PR_TRUE); } fclose(aesreq); } @@ -1719,7 +1488,7 @@ aes_cbc_mct(char *reqfn) unsigned char ciphertext_1[16]; /* CT[j-1] */ unsigned char doublecheck[16]; unsigned int outputlen; - AESContext *cx = NULL; /* the operation being tested */ + AESContext *cx = NULL; /* the operation being tested */ AESContext *cx2 = NULL; /* the inverse operation done in parallel * to doublecheck our result. */ @@ -1728,287 +1497,287 @@ aes_cbc_mct(char *reqfn) aesreq = fopen(reqfn, "r"); aesresp = stdout; while (fgets(buf, sizeof buf, aesreq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, aesresp); - continue; - } - /* [ENCRYPT] or [DECRYPT] */ - if (buf[0] == '[') { - if (strncmp(&buf[1], "ENCRYPT", 7) == 0) { - encrypt = 1; - } else { - encrypt = 0; - } - fputs(buf, aesresp); - continue; - } - /* "COUNT = x" begins a new data set */ - if (strncmp(buf, "COUNT", 5) == 0) { - /* zeroize the variables for the test with this data set */ - memset(key, 0, sizeof key); - keysize = 0; - memset(iv, 0, sizeof iv); - memset(plaintext, 0, sizeof plaintext); - memset(ciphertext, 0, sizeof ciphertext); - continue; - } - /* KEY = ... */ - if (strncmp(buf, "KEY", 3) == 0) { - /* Key[0] = Key */ - i = 3; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &key[j]); - } - keysize = j; - continue; - } - /* IV = ... */ - if (strncmp(buf, "IV", 2) == 0) { - /* IV[0] = IV */ - i = 2; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<sizeof iv; i+=2,j++) { - hex_to_byteval(&buf[i], &iv[j]); - } - continue; - } - /* PLAINTEXT = ... */ - if (strncmp(buf, "PLAINTEXT", 9) == 0) { - /* sanity check */ - if (!encrypt) { - goto loser; - } - /* PT[0] = PT */ - i = 9; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<sizeof plaintext; i+=2,j++) { - hex_to_byteval(&buf[i], &plaintext[j]); - } - - for (i=0; i<100; i++) { - sprintf(buf, "COUNT = %d\n", i); - fputs(buf, aesresp); - /* Output Key[i] */ - fputs("KEY = ", aesresp); - to_hex_str(buf, key, keysize); - fputs(buf, aesresp); - fputc('\n', aesresp); - /* Output IV[i] */ - fputs("IV = ", aesresp); - to_hex_str(buf, iv, sizeof iv); - fputs(buf, aesresp); - fputc('\n', aesresp); - /* Output PT[0] */ - fputs("PLAINTEXT = ", aesresp); - to_hex_str(buf, plaintext, sizeof plaintext); - fputs(buf, aesresp); - fputc('\n', aesresp); - - cx = AES_CreateContext(key, iv, NSS_AES_CBC, - PR_TRUE, keysize, 16); - if (cx == NULL) { - goto loser; - } - /* - * doublecheck our result by decrypting the result - * and comparing the output with the plaintext. - */ - cx2 = AES_CreateContext(key, iv, NSS_AES_CBC, - PR_FALSE, keysize, 16); - if (cx2 == NULL) { - goto loser; - } - /* CT[-1] = IV[i] */ - memcpy(ciphertext, iv, sizeof ciphertext); - for (j=0; j<1000; j++) { - /* Save CT[j-1] */ - memcpy(ciphertext_1, ciphertext, sizeof ciphertext); - /* - * If ( j=0 ) - * CT[j] = AES(Key[i], IV[i], PT[j]) - * PT[j+1] = IV[i] (= CT[j-1]) - * Else - * CT[j] = AES(Key[i], PT[j]) - * PT[j+1] = CT[j-1] - */ - outputlen = 0; - rv = AES_Encrypt(cx, - ciphertext, &outputlen, sizeof ciphertext, - plaintext, sizeof plaintext); - if (rv != SECSuccess) { - goto loser; - } - if (outputlen != sizeof plaintext) { - goto loser; - } - - /* doublecheck our result */ - outputlen = 0; - rv = AES_Decrypt(cx2, - doublecheck, &outputlen, sizeof doublecheck, - ciphertext, sizeof ciphertext); - if (rv != SECSuccess) { - goto loser; - } - if (outputlen != sizeof ciphertext) { - goto loser; - } - if (memcmp(doublecheck, plaintext, sizeof plaintext)) { - goto loser; - } - - memcpy(plaintext, ciphertext_1, sizeof plaintext); - } - AES_DestroyContext(cx, PR_TRUE); - cx = NULL; - AES_DestroyContext(cx2, PR_TRUE); - cx2 = NULL; - - /* Output CT[j] */ - fputs("CIPHERTEXT = ", aesresp); - to_hex_str(buf, ciphertext, sizeof ciphertext); - fputs(buf, aesresp); - fputc('\n', aesresp); - - /* Key[i+1] = Key[i] xor ... */ - aes_mct_next_key(key, keysize, ciphertext_1, ciphertext); - /* IV[i+1] = CT[j] */ - memcpy(iv, ciphertext, sizeof iv); - /* PT[0] = CT[j-1] */ - /* done at the end of the for(j) loop */ - - fputc('\n', aesresp); - } + /* a comment or blank line */ + if (buf[0] == '#' || buf[0] == '\n') { + fputs(buf, aesresp); + continue; + } + /* [ENCRYPT] or [DECRYPT] */ + if (buf[0] == '[') { + if (strncmp(&buf[1], "ENCRYPT", 7) == 0) { + encrypt = 1; + } else { + encrypt = 0; + } + fputs(buf, aesresp); + continue; + } + /* "COUNT = x" begins a new data set */ + if (strncmp(buf, "COUNT", 5) == 0) { + /* zeroize the variables for the test with this data set */ + memset(key, 0, sizeof key); + keysize = 0; + memset(iv, 0, sizeof iv); + memset(plaintext, 0, sizeof plaintext); + memset(ciphertext, 0, sizeof ciphertext); + continue; + } + /* KEY = ... */ + if (strncmp(buf, "KEY", 3) == 0) { + /* Key[0] = Key */ + i = 3; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; isxdigit(buf[i]); i+=2,j++) { + hex_to_byteval(&buf[i], &key[j]); + } + keysize = j; + continue; + } + /* IV = ... */ + if (strncmp(buf, "IV", 2) == 0) { + /* IV[0] = IV */ + i = 2; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; j<sizeof iv; i+=2,j++) { + hex_to_byteval(&buf[i], &iv[j]); + } + continue; + } + /* PLAINTEXT = ... */ + if (strncmp(buf, "PLAINTEXT", 9) == 0) { + /* sanity check */ + if (!encrypt) { + goto loser; + } + /* PT[0] = PT */ + i = 9; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; j<sizeof plaintext; i+=2,j++) { + hex_to_byteval(&buf[i], &plaintext[j]); + } - continue; - } - /* CIPHERTEXT = ... */ - if (strncmp(buf, "CIPHERTEXT", 10) == 0) { - /* sanity check */ - if (encrypt) { - goto loser; - } - /* CT[0] = CT */ - i = 10; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &ciphertext[j]); - } + for (i=0; i<100; i++) { + sprintf(buf, "COUNT = %d\n", i); + fputs(buf, aesresp); + /* Output Key[i] */ + fputs("KEY = ", aesresp); + to_hex_str(buf, key, keysize); + fputs(buf, aesresp); + fputc('\n', aesresp); + /* Output IV[i] */ + fputs("IV = ", aesresp); + to_hex_str(buf, iv, sizeof iv); + fputs(buf, aesresp); + fputc('\n', aesresp); + /* Output PT[0] */ + fputs("PLAINTEXT = ", aesresp); + to_hex_str(buf, plaintext, sizeof plaintext); + fputs(buf, aesresp); + fputc('\n', aesresp); + + cx = AES_CreateContext(key, iv, NSS_AES_CBC, + PR_TRUE, keysize, 16); + if (cx == NULL) { + goto loser; + } + /* + * doublecheck our result by decrypting the result + * and comparing the output with the plaintext. + */ + cx2 = AES_CreateContext(key, iv, NSS_AES_CBC, + PR_FALSE, keysize, 16); + if (cx2 == NULL) { + goto loser; + } + /* CT[-1] = IV[i] */ + memcpy(ciphertext, iv, sizeof ciphertext); + for (j=0; j<1000; j++) { + /* Save CT[j-1] */ + memcpy(ciphertext_1, ciphertext, sizeof ciphertext); + /* + * If ( j=0 ) + * CT[j] = AES(Key[i], IV[i], PT[j]) + * PT[j+1] = IV[i] (= CT[j-1]) + * Else + * CT[j] = AES(Key[i], PT[j]) + * PT[j+1] = CT[j-1] + */ + outputlen = 0; + rv = AES_Encrypt(cx, + ciphertext, &outputlen, sizeof ciphertext, + plaintext, sizeof plaintext); + if (rv != SECSuccess) { + goto loser; + } + if (outputlen != sizeof plaintext) { + goto loser; + } - for (i=0; i<100; i++) { - sprintf(buf, "COUNT = %d\n", i); - fputs(buf, aesresp); - /* Output Key[i] */ - fputs("KEY = ", aesresp); - to_hex_str(buf, key, keysize); - fputs(buf, aesresp); - fputc('\n', aesresp); - /* Output IV[i] */ - fputs("IV = ", aesresp); - to_hex_str(buf, iv, sizeof iv); - fputs(buf, aesresp); - fputc('\n', aesresp); - /* Output CT[0] */ - fputs("CIPHERTEXT = ", aesresp); - to_hex_str(buf, ciphertext, sizeof ciphertext); - fputs(buf, aesresp); - fputc('\n', aesresp); - - cx = AES_CreateContext(key, iv, NSS_AES_CBC, - PR_FALSE, keysize, 16); - if (cx == NULL) { - goto loser; - } - /* - * doublecheck our result by encrypting the result - * and comparing the output with the ciphertext. - */ - cx2 = AES_CreateContext(key, iv, NSS_AES_CBC, - PR_TRUE, keysize, 16); - if (cx2 == NULL) { - goto loser; - } - /* PT[-1] = IV[i] */ - memcpy(plaintext, iv, sizeof plaintext); - for (j=0; j<1000; j++) { - /* Save PT[j-1] */ - memcpy(plaintext_1, plaintext, sizeof plaintext); - /* - * If ( j=0 ) - * PT[j] = AES(Key[i], IV[i], CT[j]) - * CT[j+1] = IV[i] (= PT[j-1]) - * Else - * PT[j] = AES(Key[i], CT[j]) - * CT[j+1] = PT[j-1] - */ - outputlen = 0; - rv = AES_Decrypt(cx, - plaintext, &outputlen, sizeof plaintext, - ciphertext, sizeof ciphertext); - if (rv != SECSuccess) { - goto loser; - } - if (outputlen != sizeof ciphertext) { - goto loser; - } + /* doublecheck our result */ + outputlen = 0; + rv = AES_Decrypt(cx2, + doublecheck, &outputlen, sizeof doublecheck, + ciphertext, sizeof ciphertext); + if (rv != SECSuccess) { + goto loser; + } + if (outputlen != sizeof ciphertext) { + goto loser; + } + if (memcmp(doublecheck, plaintext, sizeof plaintext)) { + goto loser; + } - /* doublecheck our result */ - outputlen = 0; - rv = AES_Encrypt(cx2, - doublecheck, &outputlen, sizeof doublecheck, - plaintext, sizeof plaintext); - if (rv != SECSuccess) { - goto loser; - } - if (outputlen != sizeof plaintext) { - goto loser; - } - if (memcmp(doublecheck, ciphertext, sizeof ciphertext)) { - goto loser; - } + memcpy(plaintext, ciphertext_1, sizeof plaintext); + } + AES_DestroyContext(cx, PR_TRUE); + cx = NULL; + AES_DestroyContext(cx2, PR_TRUE); + cx2 = NULL; + + /* Output CT[j] */ + fputs("CIPHERTEXT = ", aesresp); + to_hex_str(buf, ciphertext, sizeof ciphertext); + fputs(buf, aesresp); + fputc('\n', aesresp); + + /* Key[i+1] = Key[i] xor ... */ + aes_mct_next_key(key, keysize, ciphertext_1, ciphertext); + /* IV[i+1] = CT[j] */ + memcpy(iv, ciphertext, sizeof iv); + /* PT[0] = CT[j-1] */ + /* done at the end of the for(j) loop */ + + fputc('\n', aesresp); + } - memcpy(ciphertext, plaintext_1, sizeof ciphertext); - } - AES_DestroyContext(cx, PR_TRUE); - cx = NULL; - AES_DestroyContext(cx2, PR_TRUE); - cx2 = NULL; + continue; + } + /* CIPHERTEXT = ... */ + if (strncmp(buf, "CIPHERTEXT", 10) == 0) { + /* sanity check */ + if (encrypt) { + goto loser; + } + /* CT[0] = CT */ + i = 10; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; isxdigit(buf[i]); i+=2,j++) { + hex_to_byteval(&buf[i], &ciphertext[j]); + } - /* Output PT[j] */ - fputs("PLAINTEXT = ", aesresp); - to_hex_str(buf, plaintext, sizeof plaintext); - fputs(buf, aesresp); - fputc('\n', aesresp); + for (i=0; i<100; i++) { + sprintf(buf, "COUNT = %d\n", i); + fputs(buf, aesresp); + /* Output Key[i] */ + fputs("KEY = ", aesresp); + to_hex_str(buf, key, keysize); + fputs(buf, aesresp); + fputc('\n', aesresp); + /* Output IV[i] */ + fputs("IV = ", aesresp); + to_hex_str(buf, iv, sizeof iv); + fputs(buf, aesresp); + fputc('\n', aesresp); + /* Output CT[0] */ + fputs("CIPHERTEXT = ", aesresp); + to_hex_str(buf, ciphertext, sizeof ciphertext); + fputs(buf, aesresp); + fputc('\n', aesresp); + + cx = AES_CreateContext(key, iv, NSS_AES_CBC, + PR_FALSE, keysize, 16); + if (cx == NULL) { + goto loser; + } + /* + * doublecheck our result by encrypting the result + * and comparing the output with the ciphertext. + */ + cx2 = AES_CreateContext(key, iv, NSS_AES_CBC, + PR_TRUE, keysize, 16); + if (cx2 == NULL) { + goto loser; + } + /* PT[-1] = IV[i] */ + memcpy(plaintext, iv, sizeof plaintext); + for (j=0; j<1000; j++) { + /* Save PT[j-1] */ + memcpy(plaintext_1, plaintext, sizeof plaintext); + /* + * If ( j=0 ) + * PT[j] = AES(Key[i], IV[i], CT[j]) + * CT[j+1] = IV[i] (= PT[j-1]) + * Else + * PT[j] = AES(Key[i], CT[j]) + * CT[j+1] = PT[j-1] + */ + outputlen = 0; + rv = AES_Decrypt(cx, + plaintext, &outputlen, sizeof plaintext, + ciphertext, sizeof ciphertext); + if (rv != SECSuccess) { + goto loser; + } + if (outputlen != sizeof ciphertext) { + goto loser; + } - /* Key[i+1] = Key[i] xor ... */ - aes_mct_next_key(key, keysize, plaintext_1, plaintext); - /* IV[i+1] = PT[j] */ - memcpy(iv, plaintext, sizeof iv); - /* CT[0] = PT[j-1] */ - /* done at the end of the for(j) loop */ + /* doublecheck our result */ + outputlen = 0; + rv = AES_Encrypt(cx2, + doublecheck, &outputlen, sizeof doublecheck, + plaintext, sizeof plaintext); + if (rv != SECSuccess) { + goto loser; + } + if (outputlen != sizeof plaintext) { + goto loser; + } + if (memcmp(doublecheck, ciphertext, sizeof ciphertext)) { + goto loser; + } - fputc('\n', aesresp); - } + memcpy(ciphertext, plaintext_1, sizeof ciphertext); + } + AES_DestroyContext(cx, PR_TRUE); + cx = NULL; + AES_DestroyContext(cx2, PR_TRUE); + cx2 = NULL; + + /* Output PT[j] */ + fputs("PLAINTEXT = ", aesresp); + to_hex_str(buf, plaintext, sizeof plaintext); + fputs(buf, aesresp); + fputc('\n', aesresp); + + /* Key[i+1] = Key[i] xor ... */ + aes_mct_next_key(key, keysize, plaintext_1, plaintext); + /* IV[i+1] = PT[j] */ + memcpy(iv, plaintext, sizeof iv); + /* CT[0] = PT[j-1] */ + /* done at the end of the for(j) loop */ + + fputc('\n', aesresp); + } - continue; - } + continue; + } } loser: if (cx != NULL) { - AES_DestroyContext(cx, PR_TRUE); + AES_DestroyContext(cx, PR_TRUE); } if (cx2 != NULL) { - AES_DestroyContext(cx2, PR_TRUE); + AES_DestroyContext(cx2, PR_TRUE); } fclose(aesreq); } @@ -2019,31 +1788,31 @@ void write_compact_string(FILE *out, unsigned char *hash, unsigned int len) int j, count = 0, last = -1, z = 0; long start = ftell(out); for (i=0; i<len; i++) { - for (j=7; j>=0; j--) { - if (last < 0) { - last = (hash[i] & (1 << j)) ? 1 : 0; - fprintf(out, "%d ", last); - count = 1; - } else if (hash[i] & (1 << j)) { - if (last) { - count++; - } else { - last = 0; - fprintf(out, "%d ", count); - count = 1; - z++; - } - } else { - if (!last) { - count++; - } else { - last = 1; - fprintf(out, "%d ", count); - count = 1; - z++; - } - } - } + for (j=7; j>=0; j--) { + if (last < 0) { + last = (hash[i] & (1 << j)) ? 1 : 0; + fprintf(out, "%d ", last); + count = 1; + } else if (hash[i] & (1 << j)) { + if (last) { + count++; + } else { + last = 0; + fprintf(out, "%d ", count); + count = 1; + z++; + } + } else { + if (!last) { + count++; + } else { + last = 1; + fprintf(out, "%d ", count); + count = 1; + z++; + } + } + } } fprintf(out, "^\n"); fseek(out, start, SEEK_SET); @@ -2058,23 +1827,23 @@ int get_next_line(FILE *req, char *key, char *val, FILE *rsp) int w = 0; int c; while ((c = fgetc(req)) != EOF) { - if (ignore) { - fprintf(rsp, "%c", c); - if (c == '\n') return ignore; - } else if (c == '\n') { - break; - } else if (c == '#') { - ignore = 1; - fprintf(rsp, "%c", c); - } else if (c == '=') { - writeto[w] = '\0'; - w = 0; - writeto = val; - } else if (c == ' ' || c == '[' || c == ']') { - continue; - } else { - writeto[w++] = c; - } + if (ignore) { + fprintf(rsp, "%c", c); + if (c == '\n') return ignore; + } else if (c == '\n') { + break; + } else if (c == '#') { + ignore = 1; + fprintf(rsp, "%c", c); + } else if (c == '=') { + writeto[w] = '\0'; + w = 0; + writeto = val; + } else if (c == ' ' || c == '[' || c == ']') { + continue; + } else { + writeto[w++] = c; + } } writeto[w] = '\0'; return (c == EOF) ? -1 : ignore; @@ -2181,18 +1950,18 @@ getECParams(const char *curve) if (curve != NULL) { numCurves = sizeof(nameTagPair)/sizeof(CurveNameTagPair); - for (i = 0; ((i < numCurves) && (curveOidTag == SEC_OID_UNKNOWN)); - i++) { - if (PL_strcmp(curve, nameTagPair[i].curveName) == 0) - curveOidTag = nameTagPair[i].curveOidTag; - } + for (i = 0; ((i < numCurves) && (curveOidTag == SEC_OID_UNKNOWN)); + i++) { + if (PL_strcmp(curve, nameTagPair[i].curveName) == 0) + curveOidTag = nameTagPair[i].curveOidTag; + } } /* Return NULL if curve name is not recognized */ if ((curveOidTag == SEC_OID_UNKNOWN) || - (oidData = SECOID_FindOIDByTag(curveOidTag)) == NULL) { + (oidData = SECOID_FindOIDByTag(curveOidTag)) == NULL) { fprintf(stderr, "Unrecognized elliptic curve %s\n", curve); - return NULL; + return NULL; } ecparams = SECITEM_AllocItem(NULL, NULL, (2 + oidData->oid.len)); @@ -2210,121 +1979,6 @@ getECParams(const char *curve) } /* - * HASH_ functions are available to full NSS apps and internally inside - * freebl, but not exported to users of freebl. Create short stubs to - * replace the functionality for fipstest. - */ -SECStatus -fips_hashBuf(HASH_HashType type, unsigned char *hashBuf, - unsigned char *msg, int len) -{ - SECStatus rv = SECFailure; - - switch (type) { - case HASH_AlgSHA1: - rv = SHA1_HashBuf(hashBuf, msg, len); - break; - case HASH_AlgSHA224: - rv = SHA224_HashBuf(hashBuf, msg, len); - break; - case HASH_AlgSHA256: - rv = SHA256_HashBuf(hashBuf, msg, len); - break; - case HASH_AlgSHA384: - rv = SHA384_HashBuf(hashBuf, msg, len); - break; - case HASH_AlgSHA512: - rv = SHA512_HashBuf(hashBuf, msg, len); - break; - default: - break; - } - return rv; -} - -int -fips_hashLen(HASH_HashType type) -{ - int len = 0; - - switch (type) { - case HASH_AlgSHA1: - len = SHA1_LENGTH; - break; - case HASH_AlgSHA224: - len = SHA224_LENGTH; - break; - case HASH_AlgSHA256: - len = SHA256_LENGTH; - break; - case HASH_AlgSHA384: - len = SHA384_LENGTH; - break; - case HASH_AlgSHA512: - len = SHA512_LENGTH; - break; - default: - break; - } - return len; -} - -SECOidTag -fips_hashOid(HASH_HashType type) -{ - SECOidTag oid = SEC_OID_UNKNOWN; - - switch (type) { - case HASH_AlgSHA1: - oid = SEC_OID_SHA1; - break; - case HASH_AlgSHA224: - oid = SEC_OID_SHA224; - break; - case HASH_AlgSHA256: - oid = SEC_OID_SHA256; - break; - case HASH_AlgSHA384: - oid = SEC_OID_SHA384; - break; - case HASH_AlgSHA512: - oid = SEC_OID_SHA512; - break; - default: - break; - } - return oid; -} - -HASH_HashType -sha_get_hashType(int hashbits) -{ - HASH_HashType hashType = HASH_AlgNULL; - - switch (hashbits) { - case 1: - case (SHA1_LENGTH*PR_BITS_PER_BYTE): - hashType = HASH_AlgSHA1; - break; - case (SHA224_LENGTH*PR_BITS_PER_BYTE): - hashType = HASH_AlgSHA224; - break; - case (SHA256_LENGTH*PR_BITS_PER_BYTE): - hashType = HASH_AlgSHA256; - break; - case (SHA384_LENGTH*PR_BITS_PER_BYTE): - hashType = HASH_AlgSHA384; - break; - case (SHA512_LENGTH*PR_BITS_PER_BYTE): - hashType = HASH_AlgSHA512; - break; - default: - break; - } - return hashType; -} - -/* * Perform the ECDSA Key Pair Generation Test. * * reqfn is the pathname of the REQUEST file. @@ -2342,7 +1996,7 @@ ecdsa_keypair_test(char *reqfn) FILE *ecdsareq; /* input stream from the REQUEST file */ FILE *ecdsaresp; /* output stream to the RESPONSE file */ char curve[16]; /* "nistxddd" */ - ECParams *ecparams = NULL; + ECParams *ecparams; int N; int i; unsigned int len; @@ -2351,95 +2005,81 @@ ecdsa_keypair_test(char *reqfn) ecdsaresp = stdout; strcpy(curve, "nist"); while (fgets(buf, sizeof buf, ecdsareq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, ecdsaresp); - continue; - } - /* [X-ddd] */ - if (buf[0] == '[') { - const char *src; - char *dst; - SECItem *encodedparams; - - if (buf[1] == 'B') { - fputs(buf, ecdsaresp); - continue; - } - if (ecparams) { - PORT_FreeArena(ecparams->arena, PR_FALSE); - ecparams = NULL; - } - - src = &buf[1]; - dst = &curve[4]; - *dst++ = tolower(*src); - src += 2; /* skip the hyphen */ - *dst++ = *src++; - *dst++ = *src++; - *dst++ = *src++; - *dst = '\0'; - encodedparams = getECParams(curve); - if (encodedparams == NULL) { - fprintf(stderr, "Unknown curve %s.", curve); - goto loser; - } - if (EC_DecodeParams(encodedparams, &ecparams) != SECSuccess) { - fprintf(stderr, "Curve %s not supported.\n", curve); - goto loser; - } - SECITEM_FreeItem(encodedparams, PR_TRUE); - fputs(buf, ecdsaresp); - continue; - } - /* N = x */ - if (buf[0] == 'N') { - if (sscanf(buf, "N = %d", &N) != 1) { - goto loser; - } - for (i = 0; i < N; i++) { - ECPrivateKey *ecpriv; + /* a comment or blank line */ + if (buf[0] == '#' || buf[0] == '\n') { + fputs(buf, ecdsaresp); + continue; + } + /* [X-ddd] */ + if (buf[0] == '[') { + const char *src; + char *dst; + SECItem *encodedparams; + + src = &buf[1]; + dst = &curve[4]; + *dst++ = tolower(*src); + src += 2; /* skip the hyphen */ + *dst++ = *src++; + *dst++ = *src++; + *dst++ = *src++; + *dst = '\0'; + encodedparams = getECParams(curve); + if (encodedparams == NULL) { + goto loser; + } + if (EC_DecodeParams(encodedparams, &ecparams) != SECSuccess) { + goto loser; + } + SECITEM_FreeItem(encodedparams, PR_TRUE); + fputs(buf, ecdsaresp); + continue; + } + /* N = x */ + if (buf[0] == 'N') { + if (sscanf(buf, "N = %d", &N) != 1) { + goto loser; + } + for (i = 0; i < N; i++) { + ECPrivateKey *ecpriv; - if (EC_NewKey(ecparams, &ecpriv) != SECSuccess) { - goto loser; - } - fputs("d = ", ecdsaresp); - to_hex_str(buf, ecpriv->privateValue.data, - ecpriv->privateValue.len); - fputs(buf, ecdsaresp); - fputc('\n', ecdsaresp); - if (EC_ValidatePublicKey(ecparams, &ecpriv->publicValue) - != SECSuccess) { - goto loser; - } - len = ecpriv->publicValue.len; - if (len%2 == 0) { - goto loser; - } - len = (len-1)/2; - if (ecpriv->publicValue.data[0] - != EC_POINT_FORM_UNCOMPRESSED) { - goto loser; - } - fputs("Qx = ", ecdsaresp); - to_hex_str(buf, &ecpriv->publicValue.data[1], len); - fputs(buf, ecdsaresp); - fputc('\n', ecdsaresp); - fputs("Qy = ", ecdsaresp); - to_hex_str(buf, &ecpriv->publicValue.data[1+len], len); - fputs(buf, ecdsaresp); - fputc('\n', ecdsaresp); - fputc('\n', ecdsaresp); - PORT_FreeArena(ecpriv->ecParams.arena, PR_TRUE); - } - continue; - } + if (EC_NewKey(ecparams, &ecpriv) != SECSuccess) { + goto loser; + } + fputs("d = ", ecdsaresp); + to_hex_str(buf, ecpriv->privateValue.data, + ecpriv->privateValue.len); + fputs(buf, ecdsaresp); + fputc('\n', ecdsaresp); + if (EC_ValidatePublicKey(ecparams, &ecpriv->publicValue) + != SECSuccess) { + goto loser; + } + len = ecpriv->publicValue.len; + if (len%2 == 0) { + goto loser; + } + len = (len-1)/2; + if (ecpriv->publicValue.data[0] + != EC_POINT_FORM_UNCOMPRESSED) { + goto loser; + } + fputs("Qx = ", ecdsaresp); + to_hex_str(buf, &ecpriv->publicValue.data[1], len); + fputs(buf, ecdsaresp); + fputc('\n', ecdsaresp); + fputs("Qy = ", ecdsaresp); + to_hex_str(buf, &ecpriv->publicValue.data[1+len], len); + fputs(buf, ecdsaresp); + fputc('\n', ecdsaresp); + fputc('\n', ecdsaresp); + PORT_FreeArena(ecpriv->ecParams.arena, PR_TRUE); + } + PORT_FreeArena(ecparams->arena, PR_FALSE); + continue; + } } loser: - if (ecparams) { - PORT_FreeArena(ecparams->arena, PR_FALSE); - ecparams = NULL; - } fclose(ecdsareq); } @@ -2471,94 +2111,92 @@ ecdsa_pkv_test(char *reqfn) strcpy(curve, "nist"); pubkey.data = NULL; while (fgets(buf, sizeof buf, ecdsareq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, ecdsaresp); - continue; - } - /* [X-ddd] */ - if (buf[0] == '[') { - const char *src; - char *dst; - SECItem *encodedparams; - - src = &buf[1]; - dst = &curve[4]; - *dst++ = tolower(*src); - src += 2; /* skip the hyphen */ - *dst++ = *src++; - *dst++ = *src++; - *dst++ = *src++; - *dst = '\0'; - if (ecparams != NULL) { - PORT_FreeArena(ecparams->arena, PR_FALSE); - ecparams = NULL; - } - encodedparams = getECParams(curve); - if (encodedparams == NULL) { - fprintf(stderr, "Unknown curve %s.", curve); - goto loser; - } - if (EC_DecodeParams(encodedparams, &ecparams) != SECSuccess) { - fprintf(stderr, "Curve %s not supported.\n", curve); - goto loser; - } - SECITEM_FreeItem(encodedparams, PR_TRUE); - len = (ecparams->fieldID.size + 7) >> 3; - if (pubkey.data != NULL) { - PORT_Free(pubkey.data); - pubkey.data = NULL; - } - SECITEM_AllocItem(NULL, &pubkey, 2*len+1); - if (pubkey.data == NULL) { - goto loser; - } - pubkey.data[0] = EC_POINT_FORM_UNCOMPRESSED; - fputs(buf, ecdsaresp); - continue; - } - /* Qx = ... */ - if (strncmp(buf, "Qx", 2) == 0) { - fputs(buf, ecdsaresp); - i = 2; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - keyvalid = from_hex_str(&pubkey.data[1], len, &buf[i]); - continue; - } - /* Qy = ... */ - if (strncmp(buf, "Qy", 2) == 0) { - fputs(buf, ecdsaresp); - if (!keyvalid) { - fputs("Result = F\n", ecdsaresp); - continue; - } - i = 2; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - keyvalid = from_hex_str(&pubkey.data[1+len], len, &buf[i]); - if (!keyvalid) { - fputs("Result = F\n", ecdsaresp); - continue; - } - if (EC_ValidatePublicKey(ecparams, &pubkey) == SECSuccess) { - fputs("Result = P\n", ecdsaresp); - } else if (PORT_GetError() == SEC_ERROR_BAD_KEY) { - fputs("Result = F\n", ecdsaresp); - } else { - goto loser; - } - continue; - } + /* a comment or blank line */ + if (buf[0] == '#' || buf[0] == '\n') { + fputs(buf, ecdsaresp); + continue; + } + /* [X-ddd] */ + if (buf[0] == '[') { + const char *src; + char *dst; + SECItem *encodedparams; + + src = &buf[1]; + dst = &curve[4]; + *dst++ = tolower(*src); + src += 2; /* skip the hyphen */ + *dst++ = *src++; + *dst++ = *src++; + *dst++ = *src++; + *dst = '\0'; + if (ecparams != NULL) { + PORT_FreeArena(ecparams->arena, PR_FALSE); + ecparams = NULL; + } + encodedparams = getECParams(curve); + if (encodedparams == NULL) { + goto loser; + } + if (EC_DecodeParams(encodedparams, &ecparams) != SECSuccess) { + goto loser; + } + SECITEM_FreeItem(encodedparams, PR_TRUE); + len = (ecparams->fieldID.size + 7) >> 3; + if (pubkey.data != NULL) { + PORT_Free(pubkey.data); + pubkey.data = NULL; + } + SECITEM_AllocItem(NULL, &pubkey, 2*len+1); + if (pubkey.data == NULL) { + goto loser; + } + pubkey.data[0] = EC_POINT_FORM_UNCOMPRESSED; + fputs(buf, ecdsaresp); + continue; + } + /* Qx = ... */ + if (strncmp(buf, "Qx", 2) == 0) { + fputs(buf, ecdsaresp); + i = 2; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + keyvalid = from_hex_str(&pubkey.data[1], len, &buf[i]); + continue; + } + /* Qy = ... */ + if (strncmp(buf, "Qy", 2) == 0) { + fputs(buf, ecdsaresp); + if (!keyvalid) { + fputs("Result = F\n", ecdsaresp); + continue; + } + i = 2; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + keyvalid = from_hex_str(&pubkey.data[1+len], len, &buf[i]); + if (!keyvalid) { + fputs("Result = F\n", ecdsaresp); + continue; + } + if (EC_ValidatePublicKey(ecparams, &pubkey) == SECSuccess) { + fputs("Result = P\n", ecdsaresp); + } else if (PORT_GetError() == SEC_ERROR_BAD_KEY) { + fputs("Result = F\n", ecdsaresp); + } else { + goto loser; + } + continue; + } } loser: if (ecparams != NULL) { - PORT_FreeArena(ecparams->arena, PR_FALSE); + PORT_FreeArena(ecparams->arena, PR_FALSE); } if (pubkey.data != NULL) { - PORT_Free(pubkey.data); + PORT_Free(pubkey.data); } fclose(ecdsareq); } @@ -2586,9 +2224,7 @@ ecdsa_siggen_test(char *reqfn) unsigned int len; unsigned char msg[512]; /* message to be signed (<= 128 bytes) */ unsigned int msglen; - unsigned char sha[HASH_LENGTH_MAX]; /* SHA digest */ - unsigned int shaLength = 0; /* length of SHA */ - HASH_HashType shaAlg = HASH_AlgNULL; /* type of SHA Alg */ + unsigned char sha1[20]; /* SHA-1 hash (160 bits) */ unsigned char sig[2*MAX_ECKEY_LEN]; SECItem signature, digest; @@ -2596,135 +2232,111 @@ ecdsa_siggen_test(char *reqfn) ecdsaresp = stdout; strcpy(curve, "nist"); while (fgets(buf, sizeof buf, ecdsareq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, ecdsaresp); - continue; - } - /* [X-ddd] */ - if (buf[0] == '[') { - const char *src; - char *dst; - SECItem *encodedparams; - - src = &buf[1]; - dst = &curve[4]; - *dst++ = tolower(*src); - src += 2; /* skip the hyphen */ - *dst++ = *src++; - *dst++ = *src++; - *dst++ = *src++; - *dst = '\0'; - src++; /* skip the comma */ - /* set the SHA Algorithm */ - if (strncmp(src, "SHA-1", 5) == 0) { - shaAlg = HASH_AlgSHA1; - } else if (strncmp(src, "SHA-224", 7) == 0) { - shaAlg = HASH_AlgSHA224; - } else if (strncmp(src, "SHA-256", 7) == 0) { - shaAlg = HASH_AlgSHA256; - } else if (strncmp(src, "SHA-384", 7)== 0) { - shaAlg = HASH_AlgSHA384; - } else if (strncmp(src, "SHA-512", 7) == 0) { - shaAlg = HASH_AlgSHA512; - } else { - fprintf(ecdsaresp, "ERROR: Unable to find SHAAlg type"); - goto loser; - } - if (ecparams != NULL) { - PORT_FreeArena(ecparams->arena, PR_FALSE); - ecparams = NULL; - } - encodedparams = getECParams(curve); - if (encodedparams == NULL) { - fprintf(stderr, "Unknown curve %s.", curve); - goto loser; - } - if (EC_DecodeParams(encodedparams, &ecparams) != SECSuccess) { - fprintf(stderr, "Curve %s not supported.\n", curve); - goto loser; - } - SECITEM_FreeItem(encodedparams, PR_TRUE); - fputs(buf, ecdsaresp); - continue; - } - /* Msg = ... */ - if (strncmp(buf, "Msg", 3) == 0) { - ECPrivateKey *ecpriv; - - i = 3; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &msg[j]); - } - msglen = j; - shaLength = fips_hashLen(shaAlg); - if (fips_hashBuf(shaAlg,sha,msg,msglen) != SECSuccess) { - if (shaLength == 0) { - fprintf(ecdsaresp, "ERROR: SHAAlg not defined."); - } - fprintf(ecdsaresp, "ERROR: Unable to generate SHA%x", - shaLength == 160 ? 1 : shaLength); - goto loser; - } - fputs(buf, ecdsaresp); - - if (EC_NewKey(ecparams, &ecpriv) != SECSuccess) { - goto loser; - } - if (EC_ValidatePublicKey(ecparams, &ecpriv->publicValue) - != SECSuccess) { - goto loser; - } - len = ecpriv->publicValue.len; - if (len%2 == 0) { - goto loser; - } - len = (len-1)/2; - if (ecpriv->publicValue.data[0] != EC_POINT_FORM_UNCOMPRESSED) { - goto loser; - } - fputs("Qx = ", ecdsaresp); - to_hex_str(buf, &ecpriv->publicValue.data[1], len); - fputs(buf, ecdsaresp); - fputc('\n', ecdsaresp); - fputs("Qy = ", ecdsaresp); - to_hex_str(buf, &ecpriv->publicValue.data[1+len], len); - fputs(buf, ecdsaresp); - fputc('\n', ecdsaresp); + /* a comment or blank line */ + if (buf[0] == '#' || buf[0] == '\n') { + fputs(buf, ecdsaresp); + continue; + } + /* [X-ddd] */ + if (buf[0] == '[') { + const char *src; + char *dst; + SECItem *encodedparams; + + src = &buf[1]; + dst = &curve[4]; + *dst++ = tolower(*src); + src += 2; /* skip the hyphen */ + *dst++ = *src++; + *dst++ = *src++; + *dst++ = *src++; + *dst = '\0'; + if (ecparams != NULL) { + PORT_FreeArena(ecparams->arena, PR_FALSE); + ecparams = NULL; + } + encodedparams = getECParams(curve); + if (encodedparams == NULL) { + goto loser; + } + if (EC_DecodeParams(encodedparams, &ecparams) != SECSuccess) { + goto loser; + } + SECITEM_FreeItem(encodedparams, PR_TRUE); + fputs(buf, ecdsaresp); + continue; + } + /* Msg = ... */ + if (strncmp(buf, "Msg", 3) == 0) { + ECPrivateKey *ecpriv; - digest.type = siBuffer; - digest.data = sha; - digest.len = shaLength; - signature.type = siBuffer; - signature.data = sig; - signature.len = sizeof sig; - if (ECDSA_SignDigest(ecpriv, &signature, &digest) != SECSuccess) { - goto loser; - } - len = signature.len; - if (len%2 != 0) { - goto loser; - } - len = len/2; - fputs("R = ", ecdsaresp); - to_hex_str(buf, &signature.data[0], len); - fputs(buf, ecdsaresp); - fputc('\n', ecdsaresp); - fputs("S = ", ecdsaresp); - to_hex_str(buf, &signature.data[len], len); - fputs(buf, ecdsaresp); - fputc('\n', ecdsaresp); + i = 3; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; isxdigit(buf[i]); i+=2,j++) { + hex_to_byteval(&buf[i], &msg[j]); + } + msglen = j; + if (SHA1_HashBuf(sha1, msg, msglen) != SECSuccess) { + goto loser; + } + fputs(buf, ecdsaresp); - PORT_FreeArena(ecpriv->ecParams.arena, PR_TRUE); - continue; - } + if (EC_NewKey(ecparams, &ecpriv) != SECSuccess) { + goto loser; + } + if (EC_ValidatePublicKey(ecparams, &ecpriv->publicValue) + != SECSuccess) { + goto loser; + } + len = ecpriv->publicValue.len; + if (len%2 == 0) { + goto loser; + } + len = (len-1)/2; + if (ecpriv->publicValue.data[0] != EC_POINT_FORM_UNCOMPRESSED) { + goto loser; + } + fputs("Qx = ", ecdsaresp); + to_hex_str(buf, &ecpriv->publicValue.data[1], len); + fputs(buf, ecdsaresp); + fputc('\n', ecdsaresp); + fputs("Qy = ", ecdsaresp); + to_hex_str(buf, &ecpriv->publicValue.data[1+len], len); + fputs(buf, ecdsaresp); + fputc('\n', ecdsaresp); + + digest.type = siBuffer; + digest.data = sha1; + digest.len = sizeof sha1; + signature.type = siBuffer; + signature.data = sig; + signature.len = sizeof sig; + if (ECDSA_SignDigest(ecpriv, &signature, &digest) != SECSuccess) { + goto loser; + } + len = signature.len; + if (len%2 != 0) { + goto loser; + } + len = len/2; + fputs("R = ", ecdsaresp); + to_hex_str(buf, &signature.data[0], len); + fputs(buf, ecdsaresp); + fputc('\n', ecdsaresp); + fputs("S = ", ecdsaresp); + to_hex_str(buf, &signature.data[len], len); + fputs(buf, ecdsaresp); + fputc('\n', ecdsaresp); + + PORT_FreeArena(ecpriv->ecParams.arena, PR_TRUE); + continue; + } } loser: if (ecparams != NULL) { - PORT_FreeArena(ecparams->arena, PR_FALSE); + PORT_FreeArena(ecparams->arena, PR_FALSE); } fclose(ecdsareq); } @@ -2748,13 +2360,11 @@ ecdsa_sigver_test(char *reqfn) char curve[16]; /* "nistxddd" */ ECPublicKey ecpub; unsigned int i, j; - unsigned int flen = 0; /* length in bytes of the field size */ - unsigned int olen = 0; /* length in bytes of the base point order */ + unsigned int flen = 0; /* length in bytes of the field size */ + unsigned int olen = 0; /* length in bytes of the base point order */ unsigned char msg[512]; /* message that was signed (<= 128 bytes) */ unsigned int msglen = 0; - unsigned char sha[HASH_LENGTH_MAX]; /* SHA digest */ - unsigned int shaLength = 0; /* length of SHA */ - HASH_HashType shaAlg = HASH_AlgNULL; /* type of SHA Alg */ + unsigned char sha1[20]; /* SHA-1 hash (160 bits) */ unsigned char sig[2*MAX_ECKEY_LEN]; SECItem signature, digest; PRBool keyvalid = PR_TRUE; @@ -2765,182 +2375,158 @@ ecdsa_sigver_test(char *reqfn) ecpub.ecParams.arena = NULL; strcpy(curve, "nist"); while (fgets(buf, sizeof buf, ecdsareq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, ecdsaresp); - continue; - } - /* [X-ddd] */ - if (buf[0] == '[') { - const char *src; - char *dst; - SECItem *encodedparams; - ECParams *ecparams; - - src = &buf[1]; - dst = &curve[4]; - *dst++ = tolower(*src); - src += 2; /* skip the hyphen */ - *dst++ = *src++; - *dst++ = *src++; - *dst++ = *src++; - *dst = '\0'; - src++; /* skip the comma */ - /* set the SHA Algorithm */ - if (strncmp(src, "SHA-1", 5) == 0) { - shaAlg = HASH_AlgSHA1; - } else if (strncmp(src, "SHA-224", 7) == 0) { - shaAlg = HASH_AlgSHA224; - } else if (strncmp(src, "SHA-256", 7) == 0) { - shaAlg = HASH_AlgSHA256; - } else if (strncmp(src, "SHA-384", 7)== 0) { - shaAlg = HASH_AlgSHA384; - } else if (strncmp(src, "SHA-512", 7) == 0) { - shaAlg = HASH_AlgSHA512; - } else { - fprintf(ecdsaresp, "ERROR: Unable to find SHAAlg type"); - goto loser; - } - encodedparams = getECParams(curve); - if (encodedparams == NULL) { - fprintf(stderr, "Unknown curve %s.", curve); - goto loser; - } - if (EC_DecodeParams(encodedparams, &ecparams) != SECSuccess) { - fprintf(stderr, "Curve %s not supported.\n", curve); - goto loser; - } - SECITEM_FreeItem(encodedparams, PR_TRUE); - if (ecpub.ecParams.arena != NULL) { - PORT_FreeArena(ecpub.ecParams.arena, PR_FALSE); - } - ecpub.ecParams.arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); - if (ecpub.ecParams.arena == NULL) { - goto loser; - } - if (EC_CopyParams(ecpub.ecParams.arena, &ecpub.ecParams, ecparams) - != SECSuccess) { - goto loser; - } - PORT_FreeArena(ecparams->arena, PR_FALSE); - flen = (ecpub.ecParams.fieldID.size + 7) >> 3; - olen = ecpub.ecParams.order.len; - if (2*olen > sizeof sig) { - goto loser; - } - ecpub.publicValue.type = siBuffer; - ecpub.publicValue.data = NULL; - ecpub.publicValue.len = 0; - SECITEM_AllocItem(ecpub.ecParams.arena, - &ecpub.publicValue, 2*flen+1); - if (ecpub.publicValue.data == NULL) { - goto loser; - } - ecpub.publicValue.data[0] = EC_POINT_FORM_UNCOMPRESSED; - fputs(buf, ecdsaresp); - continue; - } - /* Msg = ... */ - if (strncmp(buf, "Msg", 3) == 0) { - i = 3; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; isxdigit(buf[i]); i+=2,j++) { - hex_to_byteval(&buf[i], &msg[j]); - } - msglen = j; - shaLength = fips_hashLen(shaAlg); - if (fips_hashBuf(shaAlg,sha,msg,msglen) != SECSuccess) { - if (shaLength == 0) { - fprintf(ecdsaresp, "ERROR: SHAAlg not defined."); - } - fprintf(ecdsaresp, "ERROR: Unable to generate SHA%x", - shaLength == 160 ? 1 : shaLength); - goto loser; - } - fputs(buf, ecdsaresp); - - digest.type = siBuffer; - digest.data = sha; - digest.len = shaLength; + /* a comment or blank line */ + if (buf[0] == '#' || buf[0] == '\n') { + fputs(buf, ecdsaresp); + continue; + } + /* [X-ddd] */ + if (buf[0] == '[') { + const char *src; + char *dst; + SECItem *encodedparams; + ECParams *ecparams; + + src = &buf[1]; + dst = &curve[4]; + *dst++ = tolower(*src); + src += 2; /* skip the hyphen */ + *dst++ = *src++; + *dst++ = *src++; + *dst++ = *src++; + *dst = '\0'; + encodedparams = getECParams(curve); + if (encodedparams == NULL) { + goto loser; + } + if (EC_DecodeParams(encodedparams, &ecparams) != SECSuccess) { + goto loser; + } + SECITEM_FreeItem(encodedparams, PR_TRUE); + if (ecpub.ecParams.arena != NULL) { + PORT_FreeArena(ecpub.ecParams.arena, PR_FALSE); + } + ecpub.ecParams.arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE); + if (ecpub.ecParams.arena == NULL) { + goto loser; + } + if (EC_CopyParams(ecpub.ecParams.arena, &ecpub.ecParams, ecparams) + != SECSuccess) { + goto loser; + } + PORT_FreeArena(ecparams->arena, PR_FALSE); + flen = (ecpub.ecParams.fieldID.size + 7) >> 3; + olen = ecpub.ecParams.order.len; + if (2*olen > sizeof sig) { + goto loser; + } + ecpub.publicValue.type = siBuffer; + ecpub.publicValue.data = NULL; + ecpub.publicValue.len = 0; + SECITEM_AllocItem(ecpub.ecParams.arena, + &ecpub.publicValue, 2*flen+1); + if (ecpub.publicValue.data == NULL) { + goto loser; + } + ecpub.publicValue.data[0] = EC_POINT_FORM_UNCOMPRESSED; + fputs(buf, ecdsaresp); + continue; + } + /* Msg = ... */ + if (strncmp(buf, "Msg", 3) == 0) { + i = 3; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; isxdigit(buf[i]); i+=2,j++) { + hex_to_byteval(&buf[i], &msg[j]); + } + msglen = j; + if (SHA1_HashBuf(sha1, msg, msglen) != SECSuccess) { + goto loser; + } + fputs(buf, ecdsaresp); - continue; - } - /* Qx = ... */ - if (strncmp(buf, "Qx", 2) == 0) { - fputs(buf, ecdsaresp); - i = 2; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - keyvalid = from_hex_str(&ecpub.publicValue.data[1], flen, - &buf[i]); - continue; - } - /* Qy = ... */ - if (strncmp(buf, "Qy", 2) == 0) { - fputs(buf, ecdsaresp); - if (!keyvalid) { - continue; - } - i = 2; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - keyvalid = from_hex_str(&ecpub.publicValue.data[1+flen], flen, - &buf[i]); - if (!keyvalid) { - continue; - } - if (EC_ValidatePublicKey(&ecpub.ecParams, &ecpub.publicValue) - != SECSuccess) { - if (PORT_GetError() == SEC_ERROR_BAD_KEY) { - keyvalid = PR_FALSE; - } else { - goto loser; - } - } - continue; - } - /* R = ... */ - if (buf[0] == 'R') { - fputs(buf, ecdsaresp); - i = 1; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - sigvalid = from_hex_str(sig, olen, &buf[i]); - continue; - } - /* S = ... */ - if (buf[0] == 'S') { - fputs(buf, ecdsaresp); - i = 1; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - if (sigvalid) { - sigvalid = from_hex_str(&sig[olen], olen, &buf[i]); - } - signature.type = siBuffer; - signature.data = sig; - signature.len = 2*olen; + digest.type = siBuffer; + digest.data = sha1; + digest.len = sizeof sha1; - if (!keyvalid || !sigvalid) { - fputs("Result = F\n", ecdsaresp); - } else if (ECDSA_VerifyDigest(&ecpub, &signature, &digest) - == SECSuccess) { - fputs("Result = P\n", ecdsaresp); - } else { - fputs("Result = F\n", ecdsaresp); - } - continue; - } + continue; + } + /* Qx = ... */ + if (strncmp(buf, "Qx", 2) == 0) { + fputs(buf, ecdsaresp); + i = 2; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + keyvalid = from_hex_str(&ecpub.publicValue.data[1], flen, + &buf[i]); + continue; + } + /* Qy = ... */ + if (strncmp(buf, "Qy", 2) == 0) { + fputs(buf, ecdsaresp); + if (!keyvalid) { + continue; + } + i = 2; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + keyvalid = from_hex_str(&ecpub.publicValue.data[1+flen], flen, + &buf[i]); + if (!keyvalid) { + continue; + } + if (EC_ValidatePublicKey(&ecpub.ecParams, &ecpub.publicValue) + != SECSuccess) { + if (PORT_GetError() == SEC_ERROR_BAD_KEY) { + keyvalid = PR_FALSE; + } else { + goto loser; + } + } + continue; + } + /* R = ... */ + if (buf[0] == 'R') { + fputs(buf, ecdsaresp); + i = 1; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + sigvalid = from_hex_str(sig, olen, &buf[i]); + continue; + } + /* S = ... */ + if (buf[0] == 'S') { + fputs(buf, ecdsaresp); + i = 1; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + if (sigvalid) { + sigvalid = from_hex_str(&sig[olen], olen, &buf[i]); + } + signature.type = siBuffer; + signature.data = sig; + signature.len = 2*olen; + + if (!keyvalid || !sigvalid) { + fputs("Result = F\n", ecdsaresp); + } else if (ECDSA_VerifyDigest(&ecpub, &signature, &digest) + == SECSuccess) { + fputs("Result = P\n", ecdsaresp); + } else { + fputs("Result = F\n", ecdsaresp); + } + continue; + } } loser: if (ecpub.ecParams.arena != NULL) { - PORT_FreeArena(ecpub.ecParams.arena, PR_FALSE); + PORT_FreeArena(ecpub.ecParams.arena, PR_FALSE); } fclose(ecdsareq); } @@ -2951,7 +2537,7 @@ isblankline(char *b) { while (isspace(*b)) b++; if ((*b == '\n') || (*b == 0)) { - return PR_TRUE; + return PR_TRUE; } return PR_FALSE; } @@ -2976,7 +2562,7 @@ drbg(char *reqfn) FILE *rngresp; /* output stream to the RESPONSE file */ unsigned int i, j; -#ifdef HANDLE_PREDICTION_RESISTANCE +#if 0 PRBool predictionResistance = PR_FALSE; #endif unsigned char *nonce = NULL; @@ -2987,9 +2573,9 @@ drbg(char *reqfn) int additionalInputLen = 0; unsigned char *entropyInput = NULL; int entropyInputLen = 0; - unsigned char *predictedreturn_bytes = NULL; - unsigned char *return_bytes = NULL; - int return_bytes_len = 0; + unsigned char predictedreturn_bytes[SHA256_LENGTH]; + unsigned char return_bytes[SHA256_LENGTH]; + int return_bytes_len = SHA256_LENGTH; enum { NONE, INSTANTIATE, GENERATE, RESEED, RESULT } command = NONE; PRBool genResult = PR_FALSE; @@ -3000,23 +2586,23 @@ drbg(char *reqfn) while (fgets(buf, sizeof buf, rngreq) != NULL) { switch (command) { case INSTANTIATE: - if (debug) { - fputs("# PRNGTEST_Instantiate(",rngresp); - to_hex_str(buf2,entropyInput, entropyInputLen); - fputs(buf2,rngresp); - fprintf(rngresp,",%d,",entropyInputLen); - to_hex_str(buf2,nonce, nonceLen); - fputs(buf2,rngresp); - fprintf(rngresp,",%d,",nonceLen); - to_hex_str(buf2,personalizationString, - personalizationStringLen); - fputs(buf2,rngresp); - fprintf(rngresp,",%d)\n", personalizationStringLen); - } + if (debug) { + fputs("# PRNGTEST_Instantiate(",rngresp); + to_hex_str(buf2,entropyInput, entropyInputLen); + fputs(buf2,rngresp); + fprintf(rngresp,",%d,",entropyInputLen); + to_hex_str(buf2,nonce, nonceLen); + fputs(buf2,rngresp); + fprintf(rngresp,",%d,",nonceLen); + to_hex_str(buf2,personalizationString, + personalizationStringLen); + fputs(buf2,rngresp); + fprintf(rngresp,",%d)\n", personalizationStringLen); + } rv = PRNGTEST_Instantiate(entropyInput, entropyInputLen, nonce, nonceLen, personalizationString, - personalizationStringLen); + personalizationStringLen); if (rv != SECSuccess) { goto loser; } @@ -3025,17 +2611,17 @@ drbg(char *reqfn) case GENERATE: case RESULT: memset(return_bytes, 0, return_bytes_len); - if (debug) { - fputs("# PRNGTEST_Generate(returnbytes",rngresp); - fprintf(rngresp,",%d,", return_bytes_len); - to_hex_str(buf2,additionalInput, additionalInputLen); - fputs(buf2,rngresp); - fprintf(rngresp,",%d)\n",additionalInputLen); - } + if (debug) { + fputs("# PRNGTEST_Generate(returnbytes",rngresp); + fprintf(rngresp,",%d,", return_bytes_len); + to_hex_str(buf2,additionalInput, additionalInputLen); + fputs(buf2,rngresp); + fprintf(rngresp,",%d)\n",additionalInputLen); + } rv = PRNGTEST_Generate((PRUint8 *) return_bytes, - return_bytes_len, + return_bytes_len, (PRUint8 *) additionalInput, - additionalInputLen); + additionalInputLen); if (rv != SECSuccess) { goto loser; } @@ -3045,9 +2631,9 @@ drbg(char *reqfn) to_hex_str(buf2, return_bytes, return_bytes_len); fputs(buf2, rngresp); fputc('\n', rngresp); - if (debug) { - fputs("# PRNGTEST_Uninstantiate()\n",rngresp); - } + if (debug) { + fputs("# PRNGTEST_Uninstantiate()\n",rngresp); + } rv = PRNGTEST_Uninstantiate(); if (rv != SECSuccess) { goto loser; @@ -3057,23 +2643,23 @@ drbg(char *reqfn) to_hex_str(buf2, return_bytes, return_bytes_len); fputs(buf2, rngresp); fputc('\n', rngresp); - } + } memset(additionalInput, 0, additionalInputLen); break; case RESEED: if (entropyInput || additionalInput) { - if (debug) { - fputs("# PRNGTEST_Reseed(",rngresp); - fprintf(rngresp,",%d,", return_bytes_len); - to_hex_str(buf2,entropyInput, entropyInputLen); - fputs(buf2,rngresp); - fprintf(rngresp,",%d,", entropyInputLen); - to_hex_str(buf2,additionalInput, additionalInputLen); - fputs(buf2,rngresp); - fprintf(rngresp,",%d)\n",additionalInputLen); - } + if (debug) { + fputs("# PRNGTEST_Reseed(",rngresp); + fprintf(rngresp,",%d,", return_bytes_len); + to_hex_str(buf2,entropyInput, entropyInputLen); + fputs(buf2,rngresp); + fprintf(rngresp,",%d,", entropyInputLen); + to_hex_str(buf2,additionalInput, additionalInputLen); + fputs(buf2,rngresp); + fprintf(rngresp,",%d)\n",additionalInputLen); + } rv = PRNGTEST_Reseed(entropyInput, entropyInputLen, additionalInput, additionalInputLen); if (rv != SECSuccess) { @@ -3101,44 +2687,22 @@ drbg(char *reqfn) continue; } +#if 0 /* currently unsupported */ if (strncmp(buf, "[PredictionResistance", 21) == 0) { -#ifdef HANDLE_PREDICTION_RESISTANCE i = 21; while (isspace(buf[i]) || buf[i] == '=') { i++; - } + } if (strncmp(buf, "False", 5) == 0) { predictionResistance = PR_FALSE; } else { predictionResistance = PR_TRUE; } -#endif fputs(buf, rngresp); continue; } - - if (strncmp(buf, "[ReturnedBitsLen", 16) == 0) { - if (return_bytes) { - PORT_ZFree(return_bytes, return_bytes_len); - return_bytes = NULL; - } - if (predictedreturn_bytes) { - PORT_ZFree(predictedreturn_bytes, return_bytes_len); - predictedreturn_bytes = NULL; - } - return_bytes_len = 0; - if (sscanf(buf, "[ReturnedBitsLen = %d]", &return_bytes_len) != 1) { - goto loser; - } - return_bytes_len = return_bytes_len/8; - if (return_bytes_len > 0) { - return_bytes = PORT_Alloc(return_bytes_len); - predictedreturn_bytes = PORT_Alloc(return_bytes_len); - } - fputs(buf, rngresp); - continue; - } +#endif if (strncmp(buf, "[EntropyInputLen", 16) == 0) { if (entropyInput) { @@ -3149,7 +2713,7 @@ drbg(char *reqfn) if (sscanf(buf, "[EntropyInputLen = %d]", &entropyInputLen) != 1) { goto loser; } - entropyInputLen = entropyInputLen/8; + entropyInputLen = entropyInputLen/8; if (entropyInputLen > 0) { entropyInput = PORT_Alloc(entropyInputLen); } @@ -3167,7 +2731,7 @@ drbg(char *reqfn) if (sscanf(buf, "[NonceLen = %d]", &nonceLen) != 1) { goto loser; } - nonceLen = nonceLen/8; + nonceLen = nonceLen/8; if (nonceLen > 0) { nonce = PORT_Alloc(nonceLen); } @@ -3185,7 +2749,7 @@ drbg(char *reqfn) if (sscanf(buf, "[PersonalizationStringLen = %d]", &personalizationStringLen) != 1) { goto loser; } - personalizationStringLen = personalizationStringLen / 8; + personalizationStringLen = personalizationStringLen / 8; if (personalizationStringLen > 0) { personalizationString = PORT_Alloc(personalizationStringLen); } @@ -3204,7 +2768,7 @@ drbg(char *reqfn) if (sscanf(buf, "[AdditionalInputLen = %d]", &additionalInputLen) != 1) { goto loser; } - additionalInputLen = additionalInputLen/8; + additionalInputLen = additionalInputLen/8; if (additionalInputLen > 0) { additionalInput = PORT_Alloc(additionalInputLen); } @@ -3341,7 +2905,7 @@ drbg(char *reqfn) if (memcmp(return_bytes, predictedreturn_bytes, return_bytes_len) != 0) { - if (debug) { + if (debug) { fprintf(rngresp, "# Generate failed:\n"); fputs( "# predicted=", rngresp); to_hex_str(buf, predictedreturn_bytes, @@ -3351,7 +2915,7 @@ drbg(char *reqfn) fputs(buf2, rngresp); fputc('\n', rngresp); - } else { + } else { fprintf(stderr, "Generate failed:\n"); fputs( " predicted=", stderr); to_hex_str(buf, predictedreturn_bytes, @@ -3360,9 +2924,9 @@ drbg(char *reqfn) fputs("\n actual = ", stderr); fputs(buf2, stderr); fputc('\n', stderr); - } + } } - memset(predictedreturn_bytes, 0 , return_bytes_len); + memset(predictedreturn_bytes, 0 , sizeof predictedreturn_bytes); continue; } @@ -3393,7 +2957,7 @@ rng_vst(char *reqfn) unsigned int i, j; unsigned char Q[DSA1_SUBPRIME_LEN]; PRBool hasQ = PR_FALSE; - unsigned int b; /* 160 <= b <= 512, b is a multiple of 8 */ + unsigned int b = 0; /* 160 <= b <= 512, b is a multiple of 8 */ unsigned char XKey[512/8]; unsigned char XSeed[512/8]; unsigned char GENX[DSA1_SIGNATURE_LEN]; @@ -3403,92 +2967,92 @@ rng_vst(char *reqfn) rngreq = fopen(reqfn, "r"); rngresp = stdout; while (fgets(buf, sizeof buf, rngreq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, rngresp); - continue; - } - /* [Xchange - SHA1] */ - if (buf[0] == '[') { - fputs(buf, rngresp); - continue; - } - /* Q = ... */ - if (buf[0] == 'Q') { - i = 1; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<sizeof Q; i+=2,j++) { - hex_to_byteval(&buf[i], &Q[j]); - } - fputs(buf, rngresp); - hasQ = PR_TRUE; - continue; - } - /* "COUNT = x" begins a new data set */ - if (strncmp(buf, "COUNT", 5) == 0) { - /* zeroize the variables for the test with this data set */ - b = 0; - memset(XKey, 0, sizeof XKey); - memset(XSeed, 0, sizeof XSeed); - fputs(buf, rngresp); - continue; - } - /* b = ... */ - if (buf[0] == 'b') { - i = 1; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - b = atoi(&buf[i]); - if (b < 160 || b > 512 || b%8 != 0) { - goto loser; - } - fputs(buf, rngresp); - continue; - } - /* XKey = ... */ - if (strncmp(buf, "XKey", 4) == 0) { - i = 4; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<b/8; i+=2,j++) { - hex_to_byteval(&buf[i], &XKey[j]); - } - fputs(buf, rngresp); - continue; - } - /* XSeed = ... */ - if (strncmp(buf, "XSeed", 5) == 0) { - i = 5; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<b/8; i+=2,j++) { - hex_to_byteval(&buf[i], &XSeed[j]); - } - fputs(buf, rngresp); + /* a comment or blank line */ + if (buf[0] == '#' || buf[0] == '\n') { + fputs(buf, rngresp); + continue; + } + /* [Xchange - SHA1] */ + if (buf[0] == '[') { + fputs(buf, rngresp); + continue; + } + /* Q = ... */ + if (buf[0] == 'Q') { + i = 1; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; j<sizeof Q; i+=2,j++) { + hex_to_byteval(&buf[i], &Q[j]); + } + fputs(buf, rngresp); + hasQ = PR_TRUE; + continue; + } + /* "COUNT = x" begins a new data set */ + if (strncmp(buf, "COUNT", 5) == 0) { + /* zeroize the variables for the test with this data set */ + b = 0; + memset(XKey, 0, sizeof XKey); + memset(XSeed, 0, sizeof XSeed); + fputs(buf, rngresp); + continue; + } + /* b = ... */ + if (buf[0] == 'b') { + i = 1; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + b = atoi(&buf[i]); + if (b < 160 || b > 512 || b%8 != 0) { + goto loser; + } + fputs(buf, rngresp); + continue; + } + /* XKey = ... */ + if (strncmp(buf, "XKey", 4) == 0) { + i = 4; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; j<b/8; i+=2,j++) { + hex_to_byteval(&buf[i], &XKey[j]); + } + fputs(buf, rngresp); + continue; + } + /* XSeed = ... */ + if (strncmp(buf, "XSeed", 5) == 0) { + i = 5; + while (isspace(buf[i]) || buf[i] == '=') { + i++; + } + for (j=0; j<b/8; i+=2,j++) { + hex_to_byteval(&buf[i], &XSeed[j]); + } + fputs(buf, rngresp); - rv = FIPS186Change_GenerateX(XKey, XSeed, GENX); - if (rv != SECSuccess) { - goto loser; - } - fputs("X = ", rngresp); - if (hasQ) { - rv = FIPS186Change_ReduceModQForDSA(GENX, Q, DSAX); - if (rv != SECSuccess) { - goto loser; - } - to_hex_str(buf, DSAX, sizeof DSAX); - } else { - to_hex_str(buf, GENX, sizeof GENX); - } - fputs(buf, rngresp); - fputc('\n', rngresp); - continue; - } + rv = FIPS186Change_GenerateX(XKey, XSeed, GENX); + if (rv != SECSuccess) { + goto loser; + } + fputs("X = ", rngresp); + if (hasQ) { + rv = FIPS186Change_ReduceModQForDSA(GENX, Q, DSAX); + if (rv != SECSuccess) { + goto loser; + } + to_hex_str(buf, DSAX, sizeof DSAX); + } else { + to_hex_str(buf, GENX, sizeof GENX); + } + fputs(buf, rngresp); + fputc('\n', rngresp); + continue; + } } loser: fclose(rngreq); @@ -3516,7 +3080,7 @@ rng_mct(char *reqfn) unsigned int i, j; unsigned char Q[DSA1_SUBPRIME_LEN]; PRBool hasQ = PR_FALSE; - unsigned int b; /* 160 <= b <= 512, b is a multiple of 8 */ + unsigned int b = 0; /* 160 <= b <= 512, b is a multiple of 8 */ unsigned char XKey[512/8]; unsigned char XSeed[512/8]; unsigned char GENX[2*SHA1_LENGTH]; @@ -3621,6 +3185,121 @@ loser: } /* + * HASH_ functions are available to full NSS apps and internally inside + * freebl, but not exported to users of freebl. Create short stubs to + * replace the functionality for fipstest. + */ +SECStatus +fips_hashBuf(HASH_HashType type, unsigned char *hashBuf, + unsigned char *msg, int len) +{ + SECStatus rv = SECFailure; + + switch (type) { + case HASH_AlgSHA1: + rv = SHA1_HashBuf(hashBuf, msg, len); + break; + case HASH_AlgSHA224: + rv = SHA224_HashBuf(hashBuf, msg, len); + break; + case HASH_AlgSHA256: + rv = SHA256_HashBuf(hashBuf, msg, len); + break; + case HASH_AlgSHA384: + rv = SHA384_HashBuf(hashBuf, msg, len); + break; + case HASH_AlgSHA512: + rv = SHA512_HashBuf(hashBuf, msg, len); + break; + default: + break; + } + return rv; +} + +int +fips_hashLen(HASH_HashType type) +{ + int len = 0; + + switch (type) { + case HASH_AlgSHA1: + len = SHA1_LENGTH; + break; + case HASH_AlgSHA224: + len = SHA224_LENGTH; + break; + case HASH_AlgSHA256: + len = SHA256_LENGTH; + break; + case HASH_AlgSHA384: + len = SHA384_LENGTH; + break; + case HASH_AlgSHA512: + len = SHA512_LENGTH; + break; + default: + break; + } + return len; +} + +SECOidTag +fips_hashOid(HASH_HashType type) +{ + SECOidTag oid = SEC_OID_UNKNOWN; + + switch (type) { + case HASH_AlgSHA1: + oid = SEC_OID_SHA1; + break; + case HASH_AlgSHA224: + oid = SEC_OID_SHA224; + break; + case HASH_AlgSHA256: + oid = SEC_OID_SHA256; + break; + case HASH_AlgSHA384: + oid = SEC_OID_SHA384; + break; + case HASH_AlgSHA512: + oid = SEC_OID_SHA512; + break; + default: + break; + } + return oid; +} + +HASH_HashType +sha_get_hashType(int hashbits) +{ + HASH_HashType hashType = HASH_AlgNULL; + + switch (hashbits) { + case 1: + case (SHA1_LENGTH*PR_BITS_PER_BYTE): + hashType = HASH_AlgSHA1; + break; + case (SHA224_LENGTH*PR_BITS_PER_BYTE): + hashType = HASH_AlgSHA224; + break; + case (SHA256_LENGTH*PR_BITS_PER_BYTE): + hashType = HASH_AlgSHA256; + break; + case (SHA384_LENGTH*PR_BITS_PER_BYTE): + hashType = HASH_AlgSHA384; + break; + case (SHA512_LENGTH*PR_BITS_PER_BYTE): + hashType = HASH_AlgSHA512; + break; + default: + break; + } + return hashType; +} + +/* * Calculate the SHA Message Digest * * MD = Message digest @@ -3704,10 +3383,10 @@ SECStatus sha_mct_test(unsigned int MDLen, unsigned char *seed, FILE *resp) void sha_test(char *reqfn) { unsigned int i, j; - unsigned int MDlen = 0; /* the length of the Message Digest in Bytes */ - unsigned int msgLen = 0; /* the length of the input Message in Bytes */ + unsigned int MDlen = 0; /* the length of the Message Digest in Bytes */ + unsigned int msgLen = 0; /* the length of the input Message in Bytes */ unsigned char *msg = NULL; /* holds the message to digest.*/ - size_t bufSize = 256*128; /*MAX buffer size */ + size_t bufSize = 25608; /*MAX buffer size */ char *buf = NULL; /* holds one line from the input REQUEST file.*/ unsigned char seed[HASH_LENGTH_MAX]; /* max size of seed 64 bytes */ unsigned char MD[HASH_LENGTH_MAX]; /* message digest */ @@ -3882,7 +3561,7 @@ void hmac_test(char *reqfn) unsigned int i, j; size_t bufSize = 400; /* MAX buffer size */ char *buf = NULL; /* holds one line from the input REQUEST file.*/ - unsigned int keyLen = 0; /* Key Length */ + unsigned int keyLen = 0; /* Key Length */ unsigned char key[200]; /* key MAX size = 184 */ unsigned int msgLen = 128; /* the length of the input */ /* Message is always 128 Bytes */ @@ -3893,7 +3572,7 @@ void hmac_test(char *reqfn) unsigned char HMAC[HASH_LENGTH_MAX]; /* computed HMAC */ unsigned char expectedHMAC[HASH_LENGTH_MAX]; /* for .fax files that have */ /* supplied known answer */ - HASH_HashType hash_alg; /* HMAC type */ + HASH_HashType hash_alg = HASH_AlgNULL; /* HMAC type */ FILE *req = NULL; /* input stream from the REQUEST file */ @@ -4014,7 +3693,7 @@ void hmac_test(char *reqfn) msg, msgLen, hash_alg) != SECSuccess) { goto loser; } - fputs("Mac = ", resp); + fputs("MAC = ", resp); to_hex_str(buf, HMAC, TLen); fputs(buf, resp); fputc('\n', resp); @@ -4079,18 +3758,18 @@ dsa_keypair_test(char *reqfn) } if (sscanf(buf, "[mod = L=%d, N=%d]", &L, &N) != 2) { - use_dsa1 = PR_TRUE; + use_dsa1 = PR_TRUE; if (sscanf(buf, "[mod = %d]", &L) != 1) { goto loser; - } + } } fputs(buf, dsaresp); fputc('\n', dsaresp); - if (use_dsa1) { + if (use_dsa1) { /************************************************************* * PQG_ParamGenSeedLen doesn't take a key size, it takes an - * index that points to a valid key size. + * index that points to a valid key size. */ keySizeIndex = PQG_PBITS_TO_INDEX(L); if(keySizeIndex == -1 || L<512 || L>1024) { @@ -4104,13 +3783,13 @@ dsa_keypair_test(char *reqfn) if (PQG_ParamGenSeedLen(keySizeIndex, PQG_TEST_SEED_BYTES, &pqg, &vfy) != SECSuccess) { fprintf(dsaresp, - "ERROR: Unable to generate PQG parameters"); + "ERROR: Unable to generate PQG parameters"); goto loser; } - } else { + } else { if (PQG_ParamGenV2(L, N, N, &pqg, &vfy) != SECSuccess) { fprintf(dsaresp, - "ERROR: Unable to generate PQG parameters"); + "ERROR: Unable to generate PQG parameters"); goto loser; } } @@ -4159,7 +3838,7 @@ loser: */ typedef enum { FIPS186_1,/* Generate/Verify P,Q & G according to FIPS 186-1 */ - A_1_2_1, /* Generate Provable P & Q */ + A_1_1_2, /* Generate Probable P & Q */ A_1_1_3, /* Verify Probable P & Q */ A_1_2_2, /* Verify Provable P & Q */ A_2_1, /* Generate Unverifiable G */ @@ -4189,7 +3868,7 @@ dsa_pqgver_test(char *reqfn) unsigned int i, j; PQGParams pqg; PQGVerify vfy; - unsigned int pghSize = 0; /* size for p, g, and h */ + unsigned int pghSize = 0; /* size for p, g, and h */ dsa_pqg_type type = FIPS186_1; dsareq = fopen(reqfn, "r"); @@ -4207,37 +3886,37 @@ dsa_pqgver_test(char *reqfn) /* [A.xxxxx ] */ if (buf[0] == '[' && buf[1] == 'A') { - if (strncmp(&buf[1],"A.1.1.3",7) == 0) { - type = A_1_1_3; - } else if (strncmp(&buf[1],"A.2.2",5) == 0) { - type = A_2_2; - } else if (strncmp(&buf[1],"A.2.4",5) == 0) { - type = A_2_4; - } else if (strncmp(&buf[1],"A.1.2.2",7) == 0) { - type = A_1_2_2; - /* validate our output from PQGGEN */ - } else if (strncmp(&buf[1],"A.1.1.2",7) == 0) { - type = A_2_4; /* validate PQ and G together */ - } else { - fprintf(stderr, "Unknown dsa ver test %s\n", &buf[1]); - exit(1); - } - + if (strncmp(&buf[1],"A.1.1.3",7) == 0) { + type = A_1_1_3; + } else if (strncmp(&buf[1],"A.2.2",5) == 0) { + type = A_2_2; + } else if (strncmp(&buf[1],"A.2.4",5) == 0) { + type = A_2_4; + } else if (strncmp(&buf[1],"A.1.2.2",7) == 0) { + type = A_1_2_2; + /* validate our output from PQGGEN */ + } else if (strncmp(&buf[1],"A.1.1.2",7) == 0) { + type = A_2_4; /* validate PQ and G together */ + } else { + fprintf(stderr, "Unknown dsa ver test %s\n", &buf[1]); + exit(1); + } + fputs(buf, dsaresp); continue; } - + /* [Mod = x] */ if (buf[0] == '[') { - if (type == FIPS186_1) { + if (type == FIPS186_1) { N=160; if (sscanf(buf, "[mod = %d]", &L) != 1) { goto loser; - } - } else if (sscanf(buf, "[mod = L=%d, N=%d", &L, &N) != 2) { - goto loser; + } + } else if (sscanf(buf, "[mod = L=%d, N=%d", &L, &N) != 2) { + goto loser; } if (pqg.prime.data) { /* P */ @@ -4261,17 +3940,17 @@ dsa_pqgver_test(char *reqfn) /*calculate the size of p, g, and h then allocate items */ pghSize = L/8; - pqg.base.data = vfy.h.data = NULL; - vfy.seed.len = pqg.base.len = vfy.h.len = 0; + pqg.base.data = vfy.h.data = NULL; + vfy.seed.len = pqg.base.len = vfy.h.len = 0; SECITEM_AllocItem(NULL, &pqg.prime, pghSize); SECITEM_AllocItem(NULL, &vfy.seed, pghSize*3); - if (type == A_2_2) { - SECITEM_AllocItem(NULL, &vfy.h, pghSize); - vfy.h.len = pghSize; - } else if (type == A_2_4) { - SECITEM_AllocItem(NULL, &vfy.h, 1); - vfy.h.len = 1; - } + if (type == A_2_2) { + SECITEM_AllocItem(NULL, &vfy.h, pghSize); + vfy.h.len = pghSize; + } else if (type == A_2_4) { + SECITEM_AllocItem(NULL, &vfy.h, 1); + vfy.h.len = 1; + } pqg.prime.len = pghSize; /* q is always N bits */ SECITEM_AllocItem(NULL, &pqg.subPrime, N/8); @@ -4330,24 +4009,24 @@ dsa_pqgver_test(char *reqfn) if (strncmp(buf, "Seed", 4) == 0) { i = 4; } else if (strncmp(buf, "domain_parameter_seed", 21) == 0) { - i = 21; - } else if (strncmp(buf,"firstseed",9) == 0) { - i = 9; - } else { - i = 0; - } - if (i) { + i = 21; + } else if (strncmp(buf,"firstseed",9) == 0) { + i = 9; + } else { + i = 0; + } + if (i) { while (isspace(buf[i]) || buf[i] == '=') { i++; } for (j=0; isxdigit(buf[i]); i+=2,j++) { hex_to_byteval(&buf[i], &vfy.seed.data[j]); } - vfy.seed.len = j; + vfy.seed.len = j; fputs(buf, dsaresp); - if (type == A_2_4) { - SECStatus result; + if (type == A_2_4) { + SECStatus result; /* Verify the Parameters */ SECStatus rv = PQG_VerifyParams(&pqg, &vfy, &result); @@ -4359,49 +4038,49 @@ dsa_pqgver_test(char *reqfn) } else { fprintf(dsaresp, "Result = F\n"); } - } + } continue; } - if ((strncmp(buf,"pseed",5) == 0) || - (strncmp(buf,"qseed",5) == 0)) - { - i = 5; + if ((strncmp(buf,"pseed",5) == 0) || + (strncmp(buf,"qseed",5) == 0)) + { + i = 5; while (isspace(buf[i]) || buf[i] == '=') { i++; } for (j=vfy.seed.len; isxdigit(buf[i]); i+=2,j++) { hex_to_byteval(&buf[i], &vfy.seed.data[j]); } - vfy.seed.len = j; + vfy.seed.len = j; fputs(buf, dsaresp); continue; - } + } if (strncmp(buf, "index", 4) == 0) { - i=5; + i=5; while (isspace(buf[i]) || buf[i] == '=') { i++; } - hex_to_byteval(&buf[i], &vfy.h.data[0]); - vfy.h.len = 1; + hex_to_byteval(&buf[i], &vfy.h.data[0]); + vfy.h.len = 1; fputs(buf, dsaresp); - } + } /* c = ... or counter=*/ if (buf[0] == 'c') { - if (strncmp(buf,"counter", 7) == 0) { + if (strncmp(buf,"counter", 7) == 0) { if (sscanf(buf, "counter = %u", &vfy.counter) != 1) { goto loser; - } - } else { + } + } else { if (sscanf(buf, "c = %u", &vfy.counter) != 1) { goto loser; - } + } } fputs(buf, dsaresp); if (type == A_1_1_3) { - SECStatus result; + SECStatus result; /* only verify P and Q, we have everything now. do it */ SECStatus rv = PQG_VerifyParams(&pqg, &vfy, &result); if (rv != SECSuccess) { @@ -4416,17 +4095,17 @@ dsa_pqgver_test(char *reqfn) } continue; } - if (strncmp(buf,"pgen_counter", 12) == 0) { + if (strncmp(buf,"pgen_counter", 12) == 0) { if (sscanf(buf, "pgen_counter = %u", &vfy.counter) != 1) { goto loser; - } + } fputs(buf, dsaresp); - continue; - } - if (strncmp(buf,"qgen_counter", 12) == 0) { + continue; + } + if (strncmp(buf,"qgen_counter", 12) == 0) { fputs(buf, dsaresp); if (type == A_1_2_2) { - SECStatus result; + SECStatus result; /* only verify P and Q, we have everything now. do it */ SECStatus rv = PQG_VerifyParams(&pqg, &vfy, &result); if (rv != SECSuccess) { @@ -4439,8 +4118,8 @@ dsa_pqgver_test(char *reqfn) } fprintf(dsaresp, "\n"); } - continue; - } + continue; + } /* H = ... */ if (buf[0] == 'H') { SECStatus rv, result = SECFailure; @@ -4452,18 +4131,18 @@ dsa_pqgver_test(char *reqfn) for (j=0; isxdigit(buf[i]); i+=2,j++) { hex_to_byteval(&buf[i], &vfy.h.data[j]); } - vfy.h.len = j; + vfy.h.len = j; fputs(buf, dsaresp); - /* this should be a byte value. Remove the leading zeros. If - * it doesn't reduce to a byte, PQG_VerifyParams will catch it - if (type == A_2_2) { - data_save = vfy.h.data; - while(vfy.h.data[0] && (vfy.h.len > 1)) { - vfy.h.data++; - vfy.h.len--; - } - } */ + /* this should be a byte value. Remove the leading zeros. If + * it doesn't reduce to a byte, PQG_VerifyParams will catch it + if (type == A_2_2) { + data_save = vfy.h.data; + while(vfy.h.data[0] && (vfy.h.len > 1)) { + vfy.h.data++; + vfy.h.len--; + } + } */ /* Verify the Parameters */ rv = PQG_VerifyParams(&pqg, &vfy, &result); @@ -4520,7 +4199,6 @@ dsa_pqggen_test(char *reqfn) int L; int i; unsigned int j; - int output_g = 1; PQGParams *pqg = NULL; PQGVerify *vfy = NULL; unsigned int keySizeIndex = 0; @@ -4537,23 +4215,21 @@ dsa_pqggen_test(char *reqfn) /* [A.xxxxx ] */ if (buf[0] == '[' && buf[1] == 'A') { - if (strncmp(&buf[1],"A.1.1.2",7) == 0) { - fprintf(stderr, "NSS does Generate Probablistic Primes\n"); + if (strncmp(&buf[1],"A.1.1.2",7) == 0) { + type = A_1_1_2; + } else if (strncmp(&buf[1],"A.2.1",5) == 0) { + fprintf(stderr, "NSS only Generates G with P&Q\n"); exit(1); - } else if (strncmp(&buf[1],"A.2.1",5) == 0) { - type = A_1_2_1; - output_g = 1; - exit(1); - } else if (strncmp(&buf[1],"A.2.3",5) == 0) { - fprintf(stderr, "NSS only Generates G with P&Q\n"); - exit(1); - } else if (strncmp(&buf[1],"A.1.2.1",7) == 0) { - type = A_1_2_1; - output_g = 0; - } else { - fprintf(stderr, "Unknown dsa pqggen test %s\n", &buf[1]); - exit(1); - } + } else if (strncmp(&buf[1],"A.2.3",5) == 0) { + fprintf(stderr, "NSS only Generates G with P&Q\n"); + exit(1); + } else if (strncmp(&buf[1],"A.1.2.1",7) == 0) { + fprintf(stderr, "NSS does not support Shawe-Taylor Primes\n"); + exit(1); + } else { + fprintf(stderr, "Unknown dsa ver test %s\n", &buf[1]); + exit(1); + } fputs(buf, dsaresp); continue; } @@ -4561,19 +4237,19 @@ dsa_pqggen_test(char *reqfn) /* [Mod = ... ] */ if (buf[0] == '[') { - if (type == FIPS186_1) { + if (type == FIPS186_1) { N=160; if (sscanf(buf, "[mod = %d]", &L) != 1) { goto loser; - } - } else if (sscanf(buf, "[mod = L=%d, N=%d", &L, &N) != 2) { - goto loser; + } + } else if (sscanf(buf, "[mod = L=%d, N=%d", &L, &N) != 2) { + goto loser; } fputs(buf, dsaresp); fputc('\n', dsaresp); - if (type == FIPS186_1) { + if (type == FIPS186_1) { /************************************************************ * PQG_ParamGenSeedLen doesn't take a key size, it takes an * index that points to a valid key size. @@ -4590,11 +4266,7 @@ dsa_pqggen_test(char *reqfn) } /* N = ... */ if (buf[0] == 'N') { - if (strncmp(buf, "Num", 3) == 0) { - if (sscanf(buf, "Num = %d", &count) != 1) { - goto loser; - } - } else if (sscanf(buf, "N = %d", &count) != 1) { + if (sscanf(buf, "N = %d", &count) != 1) { goto loser; } for (i = 0; i < count; i++) { @@ -4615,38 +4287,24 @@ dsa_pqggen_test(char *reqfn) fprintf(dsaresp, "P = %s\n", buf); to_hex_str(buf, pqg->subPrime.data, pqg->subPrime.len); fprintf(dsaresp, "Q = %s\n", buf); - if (output_g) { - to_hex_str(buf, pqg->base.data, pqg->base.len); - fprintf(dsaresp, "G = %s\n", buf); - } - if (type == FIPS186_1) { + to_hex_str(buf, pqg->base.data, pqg->base.len); + fprintf(dsaresp, "G = %s\n", buf); + if (type == FIPS186_1) { to_hex_str(buf, vfy->seed.data, vfy->seed.len); fprintf(dsaresp, "Seed = %s\n", buf); fprintf(dsaresp, "c = %d\n", vfy->counter); to_hex_str(buf, vfy->h.data, vfy->h.len); fputs("H = ", dsaresp); for (j=vfy->h.len; j< pqg->prime.len; j++) { - fprintf(dsaresp, "00"); + fprintf(dsaresp, "00"); } fprintf(dsaresp, "%s\n", buf); - } else { - unsigned int seedlen = vfy->seed.len/2; - unsigned int pgen_counter = vfy->counter >> 16; - unsigned int qgen_counter = vfy->counter & 0xffff; - /*fprintf(dsaresp, "index = %02x\n", vfy->h.data[0]); */ - to_hex_str(buf, vfy->seed.data, seedlen); - fprintf(dsaresp, "pseed = %s\n", buf); - to_hex_str(buf, vfy->seed.data+seedlen, seedlen); - fprintf(dsaresp, "qseed = %s\n", buf); - fprintf(dsaresp, "pgen_counter = %d\n", pgen_counter); - fprintf(dsaresp, "qgen_counter = %d\n", qgen_counter); - if (output_g) { - to_hex_str(buf, vfy->seed.data, vfy->seed.len); - fprintf(dsaresp, "domain_parameter_seed = %s\n", buf); - fprintf(dsaresp, "index = %02x\n", vfy->h.data[0]); - } - - } + } else { + fprintf(dsaresp, "counter = %d\n", vfy->counter); + fprintf(dsaresp, "index = %02x\n", vfy->h.data[0]); + to_hex_str(buf, vfy->seed.data, vfy->seed.len); + fprintf(dsaresp, "domain_parameter_seed = %s\n", buf); + } fputc('\n', dsaresp); if(pqg!=NULL) { PQG_DestroyParams(pqg); @@ -4732,7 +4390,7 @@ dsa_siggen_test(char *reqfn) if (sscanf(buf, "[mod = L=%d, N=%d, SHA-%d]", &L, & N, &hashNum) != 3) { use_dsa1 = PR_TRUE; - hashNum = 1; + hashNum = 1; if (sscanf(buf, "[mod = %d]", &modulus) != 1) { goto loser; } @@ -4779,11 +4437,11 @@ dsa_siggen_test(char *reqfn) goto loser; } - hashType = sha_get_hashType(hashNum); - if (hashType == HASH_AlgNULL) { - fprintf(dsaresp, "ERROR: invalid hash (SHA-%d)",hashNum); - goto loser; - } + hashType = sha_get_hashType(hashNum); + if (hashType == HASH_AlgNULL) { + fprintf(dsaresp, "ERROR: invalid hash (SHA-%d)",hashNum); + goto loser; + } continue; } @@ -4792,10 +4450,10 @@ dsa_siggen_test(char *reqfn) unsigned char msg[128]; /* MAX msg 128 */ unsigned int len = 0; - if (hashType == HASH_AlgNULL) { - fprintf(dsaresp, "ERROR: Hash Alg not set"); - goto loser; - } + if (hashType == HASH_AlgNULL) { + fprintf(dsaresp, "ERROR: Hash Alg not set"); + goto loser; + } memset(hashBuf, 0, sizeof hashBuf); memset(sig, 0, sizeof sig); @@ -4809,7 +4467,7 @@ dsa_siggen_test(char *reqfn) } if (fips_hashBuf(hashType, hashBuf, msg, j) != SECSuccess) { fprintf(dsaresp, "ERROR: Unable to generate SHA% digest", - hashNum); + hashNum); goto loser; } @@ -4904,8 +4562,8 @@ dsa_sigver_test(char *reqfn) if (sscanf(buf, "[mod = L=%d, N=%d, SHA-%d]", &L, & N, &hashNum) != 3) { - N=160; - hashNum = 1; + N=160; + hashNum = 1; if (sscanf(buf, "[mod = %d]", &L) != 1) { goto loser; } @@ -4937,11 +4595,11 @@ dsa_sigver_test(char *reqfn) SECITEM_AllocItem(NULL, &pubkey.params.subPrime, N/8); pubkey.params.subPrime.len = N/8; - hashType = sha_get_hashType(hashNum); - if (hashType == HASH_AlgNULL) { - fprintf(dsaresp, "ERROR: invalid hash (SHA-%d)",hashNum); - goto loser; - } + hashType = sha_get_hashType(hashNum); + if (hashType == HASH_AlgNULL) { + fprintf(dsaresp, "ERROR: invalid hash (SHA-%d)",hashNum); + goto loser; + } continue; } @@ -4995,10 +4653,10 @@ dsa_sigver_test(char *reqfn) unsigned char msg[128]; /* MAX msg 128 */ memset(hashBuf, 0, sizeof hashBuf); - if (hashType == HASH_AlgNULL) { - fprintf(dsaresp, "ERROR: Hash Alg not set"); - goto loser; - } + if (hashType == HASH_AlgNULL) { + fprintf(dsaresp, "ERROR: Hash Alg not set"); + goto loser; + } i = 3; while (isspace(buf[i]) || buf[i] == '=') { @@ -5009,7 +4667,7 @@ dsa_sigver_test(char *reqfn) } if (fips_hashBuf(hashType, hashBuf, msg, j) != SECSuccess) { fprintf(dsaresp, "ERROR: Unable to generate SHA-%d digest", - hashNum); + hashNum); goto loser; } @@ -5049,17 +4707,17 @@ dsa_sigver_test(char *reqfn) /* S = ... */ if (buf[0] == 'S') { - if (hashType == HASH_AlgNULL) { - fprintf(dsaresp, "ERROR: Hash Alg not set"); - goto loser; - } + if (hashType == HASH_AlgNULL) { + fprintf(dsaresp, "ERROR: Hash Alg not set"); + goto loser; + } i = 1; while (isspace(buf[i]) || buf[i] == '=') { i++; } for (j=pubkey.params.subPrime.len; - j< pubkey.params.subPrime.len*2; i+=2,j++) { + j< pubkey.params.subPrime.len*2; i+=2,j++) { hex_to_byteval(&buf[i], &sig[j]); } fputs(buf, dsaresp); @@ -5076,7 +4734,7 @@ dsa_sigver_test(char *reqfn) } else { fprintf(dsaresp, "Result = F\n"); } - fprintf(dsaresp, "\n"); + fprintf(dsaresp, "\n"); continue; } } @@ -5096,118 +4754,6 @@ loser: } } -static void -pad(unsigned char *buf, int pad_len, unsigned char *src, int src_len) -{ - int offset = 0; - /* this shouldn't happen, fail right away rather than produce bad output */ - if (pad_len < src_len) { - fprintf(stderr, "data bigger than expected! %d > %d\n", src_len, pad_len); - exit(1); - } - - offset = pad_len - src_len; - memset(buf, 0, offset); - memcpy(buf+offset, src, src_len); - return; -} - - -/* - * Perform the DSA Key Pair Generation Test. - * - * reqfn is the pathname of the REQUEST file. - * - * The output RESPONSE file is written to stdout. - */ -void -rsa_keypair_test(char *reqfn) -{ - char buf[800]; /* holds one line from the input REQUEST file - * or to the output RESPONSE file. - * 800 to hold (384 public key (x2 for HEX) + 1'\n' - */ - unsigned char buf2[400]; /* can't need more then 1/2 buf length */ - FILE *rsareq; /* input stream from the REQUEST file */ - FILE *rsaresp; /* output stream to the RESPONSE file */ - int count; - int i; - int keySize; /* key size in bits*/ - int len; /* key size in bytes */ - int len2; /* key size in bytes/2 (prime size) */ - SECItem e; - unsigned char default_e[] = { 0x1, 0x0, 0x1 }; - - e.data = default_e; - e.len = sizeof (default_e); - - rsareq = fopen(reqfn, "r"); - rsaresp = stdout; - while (fgets(buf, sizeof buf, rsareq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, rsaresp); - continue; - } - - /* [Mod = x] */ - if (buf[0] == '[') { - if (buf[1] == 'm') { - if (sscanf(buf, "[mod = %d]", &keySize) != 1) { - goto loser; - } - len = keySize/8; - len2 = keySize/16; - } - fputs(buf, rsaresp); - continue; - } - /* N = ...*/ - if (buf[0] == 'N') { - - if (sscanf(buf, "N = %d", &count) != 1) { - goto loser; - } - - /* Generate a DSA key, and output the key pair for N times */ - for (i = 0; i < count; i++) { - RSAPrivateKey *rsakey = NULL; - if ((rsakey = RSA_NewKey(keySize, &e)) == NULL) { - fprintf(rsaresp, "ERROR: Unable to generate RSA key"); - goto loser; - } - pad(buf2,len,rsakey->publicExponent.data, - rsakey->publicExponent.len); - to_hex_str(buf, buf2, len); - fprintf(rsaresp, "e = %s\n", buf); - pad(buf2,len2,rsakey->prime1.data, - rsakey->prime1.len); - to_hex_str(buf, buf2, len2); - fprintf(rsaresp, "p = %s\n", buf); - pad(buf2,len2,rsakey->prime2.data, - rsakey->prime2.len); - to_hex_str(buf, buf2, len2); - fprintf(rsaresp, "q = %s\n", buf); - pad(buf2,len,rsakey->modulus.data, - rsakey->modulus.len); - to_hex_str(buf, buf2, len); - fprintf(rsaresp, "n = %s\n", buf); - pad(buf2,len,rsakey->privateExponent.data, - rsakey->privateExponent.len); - to_hex_str(buf, buf2, len); - fprintf(rsaresp, "d = %s\n", buf); - fprintf(rsaresp, "\n"); - PORT_FreeArena(rsakey->arena, PR_TRUE); - rsakey = NULL; - } - continue; - } - - } -loser: - fclose(rsareq); -} - /* * Perform the RSA Signature Generation Test. * @@ -5366,16 +4912,16 @@ rsa_siggen_test(char *reqfn) for (j=0; isxdigit(buf[i]) && j < sizeof(msg); i+=2,j++) { hex_to_byteval(&buf[i], &msg[j]); } - shaLength = fips_hashLen(shaAlg); - if (fips_hashBuf(shaAlg,sha,msg,j) != SECSuccess) { - if (shaLength == 0) { - fprintf(rsaresp, "ERROR: SHAAlg not defined."); - } + shaLength = fips_hashLen(shaAlg); + if (fips_hashBuf(shaAlg,sha,msg,j) != SECSuccess) { + if (shaLength == 0) { + fprintf(rsaresp, "ERROR: SHAAlg not defined."); + } fprintf(rsaresp, "ERROR: Unable to generate SHA%x", - shaLength == 160 ? 1 : shaLength); + shaLength == 160 ? 1 : shaLength); goto loser; } - shaOid = fips_hashOid(shaAlg); + shaOid = fips_hashOid(shaAlg); /* Perform RSA signature with the RSA private key. */ rv = RSA_HashSign( shaOid, @@ -5590,13 +5136,13 @@ rsa_sigver_test(char *reqfn) hex_to_byteval(&buf[i], &msg[j]); } - shaLength = fips_hashLen(shaAlg); - if (fips_hashBuf(shaAlg,sha,msg,j) != SECSuccess) { - if (shaLength == 0) { - fprintf(rsaresp, "ERROR: SHAAlg not defined."); - } + shaLength = fips_hashLen(shaAlg); + if (fips_hashBuf(shaAlg,sha,msg,j) != SECSuccess) { + if (shaLength == 0) { + fprintf(rsaresp, "ERROR: SHAAlg not defined."); + } fprintf(rsaresp, "ERROR: Unable to generate SHA%x", - shaLength == 160 ? 1 : shaLength); + shaLength == 160 ? 1 : shaLength); goto loser; } @@ -5629,8 +5175,6 @@ rsa_sigver_test(char *reqfn) signatureLength = j; fputs(buf, rsaresp); - shaOid = fips_hashOid(shaAlg); - /* Perform RSA verification with the RSA public key. */ rv = RSA_HashCheckSign( shaOid, rsa_public_key, @@ -5656,302 +5200,6 @@ loser: } } -void -tls(char *reqfn) -{ - char buf[256]; /* holds one line from the input REQUEST file. - * needs to be large enough to hold the longest - * line "XSeed = <128 hex digits>\n". - */ - unsigned char *pms = NULL; - int pms_len; - unsigned char *master_secret = NULL; - unsigned char *key_block = NULL; - int key_block_len; - unsigned char serverHello_random[SSL3_RANDOM_LENGTH]; - unsigned char clientHello_random[SSL3_RANDOM_LENGTH]; - unsigned char server_random[SSL3_RANDOM_LENGTH]; - unsigned char client_random[SSL3_RANDOM_LENGTH]; - FILE *tlsreq = NULL; /* input stream from the REQUEST file */ - FILE *tlsresp; /* output stream to the RESPONSE file */ - unsigned int i, j; - CK_SLOT_ID slotList[10]; - CK_SLOT_ID slotID; - CK_ULONG slotListCount = sizeof(slotList)/sizeof(slotList[0]); - CK_ULONG count; - static const CK_C_INITIALIZE_ARGS pk11args= { - NULL, NULL, NULL, NULL, CKF_LIBRARY_CANT_CREATE_OS_THREADS , - (void *)"flags=readOnly,noCertDB,noModDB", NULL }; - static CK_OBJECT_CLASS ck_secret = CKO_SECRET_KEY; - static CK_KEY_TYPE ck_generic = CKK_GENERIC_SECRET; - static CK_BBOOL ck_true = CK_TRUE; - static CK_ULONG one = 1; - CK_ATTRIBUTE create_template[] = { - { CKA_VALUE, NULL, 0 }, - { CKA_CLASS, &ck_secret, sizeof(ck_secret) }, - { CKA_KEY_TYPE, &ck_generic, sizeof(ck_generic) }, - { CKA_DERIVE, &ck_true, sizeof (ck_true) }, - }; - CK_ULONG create_template_count = - sizeof(create_template)/sizeof(create_template[0]); - CK_ATTRIBUTE derive_template[] = { - { CKA_CLASS, &ck_secret, sizeof(ck_secret) }, - { CKA_KEY_TYPE, &ck_generic, sizeof(ck_generic) }, - { CKA_DERIVE, &ck_true, sizeof(ck_true) }, - { CKA_VALUE_LEN, &one, sizeof(one) }, - }; - CK_ULONG derive_template_count = - sizeof(derive_template)/sizeof(derive_template[0]); - CK_ATTRIBUTE master_template = - { CKA_VALUE, NULL, 0 }; - CK_ATTRIBUTE kb1_template = - { CKA_VALUE, NULL, 0 }; - CK_ATTRIBUTE kb2_template = - { CKA_VALUE, NULL, 0 }; - - - CK_MECHANISM master_mech = { CKM_TLS_MASTER_KEY_DERIVE , NULL, 0 }; - CK_MECHANISM key_block_mech = { CKM_TLS_KEY_AND_MAC_DERIVE , NULL, 0}; - CK_SSL3_MASTER_KEY_DERIVE_PARAMS master_params; - CK_SSL3_KEY_MAT_PARAMS key_block_params; - CK_SSL3_KEY_MAT_OUT key_material; - CK_RV crv; - - /* set up PKCS #11 parameters */ - master_params.pVersion = NULL; - master_params.RandomInfo.pClientRandom = clientHello_random; - master_params.RandomInfo.ulClientRandomLen = sizeof(clientHello_random); - master_params.RandomInfo.pServerRandom = serverHello_random; - master_params.RandomInfo.ulServerRandomLen = sizeof(serverHello_random); - master_mech.pParameter = (void *) &master_params; - master_mech.ulParameterLen = sizeof(master_params); - key_block_params.ulMacSizeInBits = 0; - key_block_params.ulKeySizeInBits = 0; - key_block_params.ulIVSizeInBits = 0; - key_block_params.bIsExport = PR_FALSE; /* ignored anyway for TLS mech */ - key_block_params.RandomInfo.pClientRandom = client_random; - key_block_params.RandomInfo.ulClientRandomLen = sizeof(client_random); - key_block_params.RandomInfo.pServerRandom = server_random; - key_block_params.RandomInfo.ulServerRandomLen = sizeof(server_random); - key_block_params.pReturnedKeyMaterial = &key_material; - key_block_mech.pParameter = (void *) &key_block_params; - key_block_mech.ulParameterLen = sizeof(key_block_params); - - - crv = NSC_Initialize((CK_VOID_PTR)&pk11args); - if (crv != CKR_OK) { - fprintf(stderr,"NSC_Initialize failed crv=0x%x\n",(unsigned int)crv); - goto loser; - } - count = slotListCount; - crv = NSC_GetSlotList(PR_TRUE,slotList, &count); - if (crv != CKR_OK) { - fprintf(stderr,"NSC_GetSlotList failed crv=0x%x\n",(unsigned int)crv); - goto loser; - } - if ((count > slotListCount) || count < 1) { - fprintf(stderr, -"NSC_GetSlotList returned too many or too few slots: %d slots max=%d min=1\n", - (int) count, (int) slotListCount); - goto loser; - } - slotID = slotList[0]; - tlsreq = fopen(reqfn, "r"); - tlsresp = stdout; - while (fgets(buf, sizeof buf, tlsreq) != NULL) { - /* a comment or blank line */ - if (buf[0] == '#' || buf[0] == '\n') { - fputs(buf, tlsresp); - continue; - } - /* [Xchange - SHA1] */ - if (buf[0] == '[') { - if (strncmp(buf, "[TLS", 4) == 0) { - if (buf[7] == '0') { - master_mech.mechanism = CKM_TLS_MASTER_KEY_DERIVE; - key_block_mech.mechanism = CKM_TLS_KEY_AND_MAC_DERIVE; - } else if (buf[7] == '2') { - master_mech.mechanism = - CKM_NSS_TLS_MASTER_KEY_DERIVE_SHA256; - key_block_mech.mechanism = - CKM_NSS_TLS_KEY_AND_MAC_DERIVE_SHA256; - } else { - fprintf(stderr, "Unknown TLS type %x\n", - (unsigned int)buf[0]); - goto loser; - } - } - if (strncmp(buf, "[pre-master", 11) == 0) { - if (sscanf(buf, "[pre-master secret length = %d]", - &pms_len) != 1) { - goto loser; - } - pms_len = pms_len/8; - pms = malloc(pms_len); - master_secret = malloc(pms_len); - create_template[0].pValue = pms; - create_template[0].ulValueLen = pms_len; - master_template.pValue = master_secret; - master_template.ulValueLen = pms_len; - } - if (strncmp(buf, "[key", 4) == 0) { - if (sscanf(buf, "[key block length = %d]", &key_block_len) != 1) { - goto loser; - } - key_block_params.ulKeySizeInBits = 8; - key_block_params.ulIVSizeInBits = key_block_len/2-8; - key_block_len=key_block_len/8; - key_block = malloc(key_block_len); - kb1_template.pValue = &key_block[0]; - kb1_template.ulValueLen = 1; - kb2_template.pValue = &key_block[1]; - kb2_template.ulValueLen = 1; - key_material.pIVClient = &key_block[2]; - key_material.pIVServer = &key_block[2+key_block_len/2-1]; - } - fputs(buf, tlsresp); - continue; - } - /* "COUNT = x" begins a new data set */ - if (strncmp(buf, "COUNT", 5) == 0) { - /* zeroize the variables for the test with this data set */ - memset(pms, 0, pms_len); - memset(master_secret, 0, pms_len); - memset(key_block, 0, key_block_len); - fputs(buf, tlsresp); - continue; - } - /* pre_master_secret = ... */ - if (strncmp(buf, "pre_master_secret", 17) == 0) { - i = 17; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<pms_len; i+=2,j++) { - hex_to_byteval(&buf[i], &pms[j]); - } - fputs(buf, tlsresp); - continue; - } - /* serverHello_random = ... */ - if (strncmp(buf, "serverHello_random", 18) == 0) { - i = 18; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<SSL3_RANDOM_LENGTH; i+=2,j++) { - hex_to_byteval(&buf[i], &serverHello_random[j]); - } - fputs(buf, tlsresp); - continue; - } - /* clientHello_random = ... */ - if (strncmp(buf, "clientHello_random", 18) == 0) { - i = 18; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<SSL3_RANDOM_LENGTH; i+=2,j++) { - hex_to_byteval(&buf[i], &clientHello_random[j]); - } - fputs(buf, tlsresp); - continue; - } - /* server_random = ... */ - if (strncmp(buf, "server_random", 13) == 0) { - i = 13; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<SSL3_RANDOM_LENGTH; i+=2,j++) { - hex_to_byteval(&buf[i], &server_random[j]); - } - fputs(buf, tlsresp); - continue; - } - /* client_random = ... */ - if (strncmp(buf, "client_random", 13) == 0) { - CK_SESSION_HANDLE session; - CK_OBJECT_HANDLE pms_handle; - CK_OBJECT_HANDLE master_handle; - CK_OBJECT_HANDLE fake_handle; - i = 13; - while (isspace(buf[i]) || buf[i] == '=') { - i++; - } - for (j=0; j<SSL3_RANDOM_LENGTH; i+=2,j++) { - hex_to_byteval(&buf[i], &client_random[j]); - } - fputs(buf, tlsresp); - crv = NSC_OpenSession(slotID, 0, NULL, NULL, &session); - if (crv != CKR_OK) { - fprintf(stderr,"NSC_OpenSession failed crv=0x%x\n", - (unsigned int)crv); - goto loser; - } - crv = NSC_CreateObject(session, create_template, - create_template_count, &pms_handle); - if (crv != CKR_OK) { - fprintf(stderr,"NSC_CreateObject failed crv=0x%x\n", - (unsigned int)crv); - goto loser; - } - crv = NSC_DeriveKey(session, &master_mech, pms_handle, - derive_template, derive_template_count-1, &master_handle); - if (crv != CKR_OK) { - fprintf(stderr,"NSC_DeriveKey(master) failed crv=0x%x\n", - (unsigned int) crv); - goto loser; - } - crv = NSC_GetAttributeValue(session, master_handle, - &master_template, 1); - if (crv != CKR_OK) { - fprintf(stderr,"NSC_GetAttribute failed crv=0x%x\n", - (unsigned int) crv); - goto loser; - } - fputs("master_secret = ", tlsresp); - to_hex_str(buf, master_secret, pms_len); - fputs(buf, tlsresp); - fputc('\n', tlsresp); - crv = NSC_DeriveKey(session, &key_block_mech, master_handle, - derive_template, derive_template_count, &fake_handle); - if (crv != CKR_OK) { - fprintf(stderr, - "NSC_DeriveKey(keyblock) failed crv=0x%x\n", - (unsigned int) crv); - goto loser; - } - crv = NSC_GetAttributeValue(session, key_material.hClientKey, - &kb1_template, 1); - if (crv != CKR_OK) { - fprintf(stderr,"NSC_GetAttribute failed crv=0x%x\n", - (unsigned int) crv); - goto loser; - } - crv = NSC_GetAttributeValue(session, key_material.hServerKey, - &kb2_template, 1); - if (crv != CKR_OK) { - fprintf(stderr,"NSC_GetAttribute failed crv=0x%x\n", - (unsigned int) crv); - goto loser; - } - fputs("key_block = ", tlsresp); - to_hex_str(buf, key_block, key_block_len); - fputs(buf, tlsresp); - fputc('\n', tlsresp); - crv = NSC_CloseSession(session); - continue; - } - } -loser: - NSC_Finalize(NULL); - if (pms) free(pms); - if (master_secret) free(master_secret); - if (key_block) free(key_block); - if (tlsreq) fclose(tlsreq); -} - int main(int argc, char **argv) { if (argc < 2) exit (-1); @@ -5984,31 +5232,23 @@ int main(int argc, char **argv) /* AES */ /*************/ } else if (strcmp(argv[1], "aes") == 0) { - /* argv[2]=kat|mmt|mct argv[3]=ecb|cbc argv[4]=<test name>.req */ - if ( strcmp(argv[2], "kat") == 0) { - /* Known Answer Test (KAT) */ - aes_kat_mmt(argv[4]); - } else if (strcmp(argv[2], "mmt") == 0) { - /* Multi-block Message Test (MMT) */ - aes_kat_mmt(argv[4]); - } else if (strcmp(argv[2], "gcm") == 0) { - if ( strcmp(argv[3], "decrypt") == 0) { - aes_gcm(argv[4],0); - } else if (strcmp(argv[3], "encrypt_extiv") == 0) { - aes_gcm(argv[4],1); - } else if (strcmp(argv[3], "encrypt_intiv") == 0) { - aes_gcm(argv[4],2); - } - } else if (strcmp(argv[2], "mct") == 0) { - /* Monte Carlo Test (MCT) */ - if ( strcmp(argv[3], "ecb") == 0) { - /* ECB mode */ - aes_ecb_mct(argv[4]); - } else if (strcmp(argv[3], "cbc") == 0) { - /* CBC mode */ - aes_cbc_mct(argv[4]); - } - } + /* argv[2]=kat|mmt|mct argv[3]=ecb|cbc argv[4]=<test name>.req */ + if ( strcmp(argv[2], "kat") == 0) { + /* Known Answer Test (KAT) */ + aes_kat_mmt(argv[4]); + } else if (strcmp(argv[2], "mmt") == 0) { + /* Multi-block Message Test (MMT) */ + aes_kat_mmt(argv[4]); + } else if (strcmp(argv[2], "mct") == 0) { + /* Monte Carlo Test (MCT) */ + if ( strcmp(argv[3], "ecb") == 0) { + /* ECB mode */ + aes_ecb_mct(argv[4]); + } else if (strcmp(argv[3], "cbc") == 0) { + /* CBC mode */ + aes_cbc_mct(argv[4]); + } + } /*************/ /* SHA */ /*************/ @@ -6026,10 +5266,7 @@ int main(int argc, char **argv) } else if (strcmp(argv[2], "sigver") == 0) { /* Signature Verification Test */ rsa_sigver_test(argv[3]); - } else if (strcmp(argv[2], "keypair") == 0) { - /* Key Pair Generation Test */ - rsa_keypair_test(argv[3]); - } + } /*************/ /* HMAC */ /*************/ diff --git a/cmd/fipstest/hmac.sh b/cmd/fipstest/hmac.sh index d29dbc27f..5f6c21c93 100755 --- a/cmd/fipstest/hmac.sh +++ b/cmd/fipstest/hmac.sh @@ -1,8 +1,8 @@ #!/bin/sh -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # # A Bourne shell script for running the NIST HMAC Algorithm Validation Suite # @@ -11,26 +11,14 @@ # shared libraries/DLLs are on the search path. Then run this script in the # directory where the REQUEST (.req) files reside. The script generates the # RESPONSE (.rsp) files in the same directory. - -BASEDIR=${1-.} -TESTDIR=${BASEDIR}/HMAC -COMMAND=${2-run} -REQDIR=${TESTDIR}/req -RSPDIR=${TESTDIR}/resp hmac_requests=" HMAC.req " -if [ ${COMMAND} = "verify" ]; then - for request in $hmac_requests; do - sh ./validate1.sh ${TESTDIR} $request - done - exit 0 -fi for request in $hmac_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest hmac ${REQDIR}/$request > ${RSPDIR}/$response + fipstest hmac $request > $response done diff --git a/cmd/fipstest/rng.sh b/cmd/fipstest/rng.sh index 1a313b422..fa1da6682 100644 --- a/cmd/fipstest/rng.sh +++ b/cmd/fipstest/rng.sh @@ -1,8 +1,8 @@ #!/bin/sh -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # # A Bourne shell script for running the NIST RNG Validation Suite # @@ -11,24 +11,13 @@ # shared libraries/DLLs are on the search path. Then run this script in the # directory where the REQUEST (.req) files reside. The script generates the # RESPONSE (.rsp) files in the same directory. -BASEDIR=${1-.} -TESTDIR=${BASEDIR}/DRBG800-90A -COMMAND=${2-run} -REQDIR=${TESTDIR}/req -RSPDIR=${TESTDIR}/resp drbg_requests=" -Hash_DRBG.req +SHA256_DRBG.req " -if [ ${COMMAND} = "verify" ]; then - for request in $drbg_requests; do - sh ./validate1.sh ${TESTDIR} $request - done - exit 0 -fi for request in $drbg_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest drbg ${REQDIR}/$request > ${RSPDIR}/$response + fipstest drbg $request > $response done diff --git a/cmd/fipstest/rsa.sh b/cmd/fipstest/rsa.sh index b86a73969..5d82c3fe2 100644 --- a/cmd/fipstest/rsa.sh +++ b/cmd/fipstest/rsa.sh @@ -1,8 +1,8 @@ #!/bin/sh -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # # A Bourne shell script for running the NIST RSA Validation System # @@ -11,40 +11,14 @@ # shared libraries/DLLs are on the search path. Then run this script in the # directory where the REQUEST (.req) files reside. The script generates the # RESPONSE (.rsp) files in the same directory. -BASEDIR=${1-.} -TESTDIR=${BASEDIR}/RSA2 -COMMAND=${2-run} -REQDIR=${TESTDIR}/req -RSPDIR=${TESTDIR}/resp - -if [ ${COMMAND} = "verify" ]; then -#verify the signatures. The fax file does not have any known answers, so -#use our own verify function. - name=SigGen15_186-3 - echo ">>>>> $name" - fipstest rsa sigver ${RSPDIR}/$name.rsp | grep ^Result.=.F -# fipstest rsa sigver ${REQDIR}/SigVer15_186-3.req | grep ^Result.=.F -#The Fax file has the private exponent and the salt value, remove it -#also remove the false reason - sh ./validate1.sh ${TESTDIR} SigVer15_186-3.req ' ' '-e /^SaltVal/d -e/^d.=/d -e /^p.=/d -e /^q.=/d -e /^EM.with/d -e /^Result.=.F/s;.(.*);;' -# -# currently don't have a way to verify the RSA keygen -# - exit 0 -fi -request=SigGen15_186-3.req -response=`echo $request | sed -e "s/req/rsp/"` -echo $request $response -fipstest rsa siggen ${REQDIR}/$request > ${RSPDIR}/$response -request=SigVer15_186-3.req +request=SigGen15.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest rsa sigver ${REQDIR}/$request > ${RSPDIR}/$response +fipstest rsa siggen $request > $response -#request=KeyGen_186-3.req -request=KeyGen_RandomProbablyPrime3_3.req +request=SigVer15.req response=`echo $request | sed -e "s/req/rsp/"` echo $request $response -fipstest rsa keypair ${REQDIR}/$request > ${RSPDIR}/$response +fipstest rsa sigver $request > $response diff --git a/cmd/fipstest/runtest.sh b/cmd/fipstest/runtest.sh deleted file mode 100644 index 99cefed77..000000000 --- a/cmd/fipstest/runtest.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -TESTDIR=${1-.} -COMMAND=${2-run} -TESTS="aes aesgcm dsa ecdsa hmac tls rng rsa sha tdea" -if [ ${NSS_ENABLE_ECC}x = 1x ]; then - TESTS=${TESTS} ecdsa -fi -for i in $TESTS -do - echo "********************Running $i tests" - sh ./${i}.sh ${TESTDIR} ${COMMAND} -done diff --git a/cmd/fipstest/sha.sh b/cmd/fipstest/sha.sh index ccc52d297..3f358cba5 100644 --- a/cmd/fipstest/sha.sh +++ b/cmd/fipstest/sha.sh @@ -1,8 +1,8 @@ #!/bin/sh -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # # A Bourne shell script for running the NIST SHA Algorithm Validation Suite # @@ -11,15 +11,9 @@ # shared libraries/DLLs are on the search path. Then run this script in the # directory where the REQUEST (.req) files reside. The script generates the # RESPONSE (.rsp) files in the same directory. -BASEDIR=${1-.} -TESTDIR=${BASEDIR}/SHA -COMMAND=${2-run} -REQDIR=${TESTDIR}/req -RSPDIR=${TESTDIR}/resp sha_ShortMsg_requests=" SHA1ShortMsg.req -SHA224ShortMsg.req SHA256ShortMsg.req SHA384ShortMsg.req SHA512ShortMsg.req @@ -27,7 +21,6 @@ SHA512ShortMsg.req sha_LongMsg_requests=" SHA1LongMsg.req -SHA224LongMsg.req SHA256LongMsg.req SHA384LongMsg.req SHA512LongMsg.req @@ -35,32 +28,23 @@ SHA512LongMsg.req sha_Monte_requests=" SHA1Monte.req -SHA224Monte.req SHA256Monte.req SHA384Monte.req SHA512Monte.req " - -if [ ${COMMAND} = "verify" ]; then - for request in $sha_ShortMsg_requests $sha_LongMsg_requests $sha_Monte_requests; do - sh ./validate1.sh ${TESTDIR} $request - done - exit 0 -fi - for request in $sha_ShortMsg_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest sha ${REQDIR}/$request > ${RSPDIR}/$response + fipstest sha $request > $response done for request in $sha_LongMsg_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest sha ${REQDIR}/$request > ${RSPDIR}/$response + fipstest sha $request > $response done for request in $sha_Monte_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest sha ${REQDIR}/$request > ${RSPDIR}/$response + fipstest sha $request > $response done diff --git a/cmd/fipstest/tdea.sh b/cmd/fipstest/tdea.sh index cbddad7d7..711acba39 100644 --- a/cmd/fipstest/tdea.sh +++ b/cmd/fipstest/tdea.sh @@ -1,8 +1,8 @@ #!/bin/sh -# # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # # A Bourne shell script for running the NIST tdea Algorithm Validation Suite # @@ -12,12 +12,6 @@ # directory where the REQUEST (.req) files reside. The script generates the # RESPONSE (.rsp) files in the same directory. -BASEDIR=${1-.} -TESTDIR=${BASEDIR}/TDES -COMMAND=${2-run} -REQDIR=${TESTDIR}/req -RSPDIR=${TESTDIR}/resp - #CBC_Known_Answer_tests #Initial Permutation KAT #Permutation Operation KAT @@ -65,42 +59,33 @@ TECBMMT2.req TECBMMT3.req " - -if [ ${COMMAND} = "verify" ]; then - for request in $cbc_kat_requests $cbc_monte_requests $cbc_mmt_requests $ecb_kat_requests $ecb_monte_requests $ecb_mmt_requests - do - sh ./validate1.sh ${TESTDIR} $request "-e /^NumKeys/d" - done - exit 0 -fi - -for request in $cbc_kat_requests; do +for request in $ecb_mmt_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest tdea kat cbc ${REQDIR}/$request > ${RSPDIR}/$response + fipstest tdea mmt ecb $request > $response done -for request in $cbc_mmt_requests; do +for request in $ecb_kat_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest tdea mmt cbc ${REQDIR}/$request > ${RSPDIR}/$response + fipstest tdea kat ecb $request > $response done -for request in $cbc_monte_requests; do +for request in $ecb_monte_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest tdea mct cbc ${REQDIR}/$request > ${RSPDIR}/$response + fipstest tdea mct ecb $request > $response done -for request in $ecb_kat_requests; do +for request in $cbc_mmt_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest tdea kat ecb ${REQDIR}/$request > ${RSPDIR}/$response + fipstest tdea mmt cbc $request > $response done -for request in $ecb_mmt_requests; do +for request in $cbc_kat_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest tdea mmt ecb ${REQDIR}/$request > ${RSPDIR}/$response + fipstest tdea kat cbc $request > $response done -for request in $ecb_monte_requests; do +for request in $cbc_monte_requests; do response=`echo $request | sed -e "s/req/rsp/"` echo $request $response - fipstest tdea mct ecb ${REQDIR}/$request > ${RSPDIR}/$response + fipstest tdea mct cbc $request > $response done diff --git a/cmd/fipstest/tls.sh b/cmd/fipstest/tls.sh deleted file mode 100644 index 1c2824539..000000000 --- a/cmd/fipstest/tls.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# A Bourne shell script for running the NIST RNG Validation Suite -# -# Before you run the script, set your PATH, LD_LIBRARY_PATH, ... environment -# variables appropriately so that the fipstest command and the NSPR and NSS -# shared libraries/DLLs are on the search path. Then run this script in the -# directory where the REQUEST (.req) files reside. The script generates the -# RESPONSE (.rsp) files in the same directory. -BASEDIR=${1-.} -TESTDIR=${BASEDIR}/KDF135 -COMMAND=${2-run} -REQDIR=${TESTDIR}/req -RSPDIR=${TESTDIR}/resp - -drbg_requests=" -tls.req -" - -if [ ${COMMAND} = "verify" ]; then - for request in $drbg_requests; do - sh ./validate1.sh ${TESTDIR} $request - done - exit 0 -fi -for request in $drbg_requests; do - response=`echo $request | sed -e "s/req/rsp/"` - echo $request $response - fipstest tls ${REQDIR}/$request > ${RSPDIR}/$response -done diff --git a/cmd/fipstest/validate.sh b/cmd/fipstest/validate.sh deleted file mode 100644 index d446dd587..000000000 --- a/cmd/fipstest/validate.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -sh ./runtest.sh ${1-.} verify diff --git a/cmd/fipstest/validate1.sh b/cmd/fipstest/validate1.sh deleted file mode 100644 index 1440af8fc..000000000 --- a/cmd/fipstest/validate1.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Validate1.sh is a helper shell script that each of the base test shell -# scripts call to help validate that the generated response (response) -# matches the known answer response (fax). Sometimes (depending on the -# individual tests) there are extraneous output in either or both response -# and fax files. These allow the caller to pass in additional sed commands -# to clear out those extraneous outputs before we compare the two files. -# The sed line always clears out Windows line endings, replaces tabs with -# spaces, and removed comments. -# -TESTDIR=${1-.} -request=${2} -extraneous_response=${3} -extraneous_fax=${4} -name=`basename $request .req` -echo ">>>>> $name" -sed -e 's;
;;g' -e 's; ; ;g' -e '/^#/d' $extraneous_response ${TESTDIR}/resp/${name}.rsp > /tmp/y1 -# if we didn't generate any output, flag that as an error -size=`sum /tmp/y1 | awk '{ print $NF }'` -if [ $size -eq 0 ]; then - echo "${TESTDIR}/resp/${name}.rsp: empty" - exit 1; -fi -sed -e 's;
;;g' -e 's; ; ;g' -e '/^#/d' $extraneous_fax ${TESTDIR}/fax/${name}.fax > /tmp/y2 -diff -i -w -B /tmp/y1 /tmp/y2 diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile index 9009d85da..68fcddfe9 100644 --- a/lib/freebl/Makefile +++ b/lib/freebl/Makefile @@ -46,24 +46,13 @@ ifeq ($(FREEBL_NO_DEPEND),1) endif ifeq ($(FREEBL_LOWHASH),1) - DEFINES += -DFREEBL_LOWHASH LOWHASH_SRCS = nsslowhash.c LOWHASH_EXPORTS = nsslowhash.h - MAPFILE_SOURCE = freebl_hash_vector.def - NEED_STUB_BUILD = 1 + MAPFILE_SOURCE = freebl_hash.def else MAPFILE_SOURCE = freebl.def endif -ifdef USE_STUB_BUILD - CSRCS = lowhash_vector.c - SIMPLE_OBJS = $(CSRCS:.c=$(OBJ_SUFFIX)) - OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(SIMPLE_OBJS)) - ALL_TRASH := $(TARGETS) $(OBJS) $(OBJDIR) LOGS TAGS $(GARBAGE) \ - $(NOSUCHFILE) so_locations - MAPFILE_SOURCE = freebl_hash.def -endif - # FREEBL_USE_PRELINK # # Most modern version of Linux support a speed optimization scheme where an @@ -98,14 +87,6 @@ ifdef LINUX DEFINES += -D__GNU_SOURCE=1 endif endif -ifdef NSS_NO_INIT_SUPPORT - DEFINES += -DNSS_NO_INIT_SUPPORT -endif -ifneq ($(OS_TARGET),Linux) - # force no init support for everything but Linux - DEFINES += -DNSS_NO_INIT_SUPPORT -endif - ifdef FREEBL_PRELINK_COMMAND DEFINES +=-DFREEBL_PRELINK_COMMAND=\"$(FREEBL_PRELINK_COMMAND)\" endif @@ -242,11 +223,6 @@ ifeq ($(CPU_ARCH),arm) DEFINES += -DSHA_NO_LONG_LONG # avoid 64-bit arithmetic in SHA512 MPI_SRCS += mpi_arm.c endif -ifeq ($(CPU_ARCH),ppc) -ifdef USE_64 - DEFINES += -DNSS_NO_INIT_SUPPORT -endif # USE_64 -endif # ppc endif # Linux ifeq ($(OS_TARGET),AIX) @@ -592,17 +568,6 @@ release_md libs:: $(SINGLE_SHLIB_DIR) endif -ifdef NEED_STUB_BUILD -SINGLE_SHLIB_DIR = $(OBJDIR)/$(OS_TARGET)_SINGLE_SHLIB -ALL_TRASH += $(SINGLE_SHLIB_DIR) -$(SINGLE_SHLIB_DIR): - -mkdir $(SINGLE_SHLIB_DIR) - -release_md libs:: $(SINGLE_SHLIB_DIR) - $(MAKE) FREEBL_CHILD_BUILD=1 USE_STUB_BUILD=1 \ - OBJDIR=$(SINGLE_SHLIB_DIR) $@ -endif - # multiple shared libraries ######################## ABI32_FPU stuff ######################### diff --git a/lib/freebl/blapii.h b/lib/freebl/blapii.h index 15271a184..4840fc79d 100644 --- a/lib/freebl/blapii.h +++ b/lib/freebl/blapii.h @@ -21,9 +21,6 @@ typedef void (*freeblDestroyFunc)(void *cx, PRBool freeit); SEC_BEGIN_PROTOS -SECStatus BL_FIPSEntryOK(PRBool freeblOnly); -PRBool BL_POSTRan(PRBool freeblOnly); - #if defined(XP_UNIX) && !defined(NO_FORK_CHECK) extern PRBool bl_parentForkedAfterC_Initialize; diff --git a/lib/freebl/blname.c b/lib/freebl/blname.c deleted file mode 100644 index db5fff58b..000000000 --- a/lib/freebl/blname.c +++ /dev/null @@ -1,98 +0,0 @@ -/* - * * blname.c - determine the freebl library name. - * * - * * This Source Code Form is subject to the terms of the Mozilla Public - * * License, v. 2.0. If a copy of the MPL was not distributed with this - * * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#if defined(FREEBL_LOWHASH) -static const char* default_name = - SHLIB_PREFIX"freeblpriv"SHLIB_VERSION"."SHLIB_SUFFIX; -#else -static const char* default_name = - SHLIB_PREFIX"freebl"SHLIB_VERSION"."SHLIB_SUFFIX; -#endif - -/* getLibName() returns the name of the library to load. */ - -#if defined(SOLARIS) && defined(__sparc) -#include <stddef.h> -#include <strings.h> -#include <sys/systeminfo.h> - - -#if defined(NSS_USE_64) - -const static char fpu_hybrid_shared_lib[] = "libfreebl_64fpu_3.so"; -const static char int_hybrid_shared_lib[] = "libfreebl_64int_3.so"; -const static char non_hybrid_shared_lib[] = "libfreebl_64fpu_3.so"; - -const static char int_hybrid_isa[] = "sparcv9"; -const static char fpu_hybrid_isa[] = "sparcv9+vis"; - -#else - -const static char fpu_hybrid_shared_lib[] = "libfreebl_32fpu_3.so"; -const static char int_hybrid_shared_lib[] = "libfreebl_32int64_3.so"; -/* This was for SPARC V8, now obsolete. */ -const static char *const non_hybrid_shared_lib = NULL; - -const static char int_hybrid_isa[] = "sparcv8plus"; -const static char fpu_hybrid_isa[] = "sparcv8plus+vis"; - -#endif - -static const char * -getLibName(void) -{ - char * found_int_hybrid; - char * found_fpu_hybrid; - long buflen; - char buf[256]; - - buflen = sysinfo(SI_ISALIST, buf, sizeof buf); - if (buflen <= 0) - return NULL; - /* sysinfo output is always supposed to be NUL terminated, but ... */ - if (buflen < sizeof buf) - buf[buflen] = '\0'; - else - buf[(sizeof buf) - 1] = '\0'; - /* The ISA list is a space separated string of names of ISAs and - * ISA extensions, in order of decreasing performance. - * There are two different ISAs with which NSS's crypto code can be - * accelerated. If both are in the list, we take the first one. - * If one is in the list, we use it, and if neither then we use - * the base unaccelerated code. - */ - found_int_hybrid = strstr(buf, int_hybrid_isa); - found_fpu_hybrid = strstr(buf, fpu_hybrid_isa); - if (found_fpu_hybrid && - (!found_int_hybrid || - (found_int_hybrid - found_fpu_hybrid) >= 0)) { - return fpu_hybrid_shared_lib; - } - if (found_int_hybrid) { - return int_hybrid_shared_lib; - } - return non_hybrid_shared_lib; -} - -#elif defined(HPUX) && !defined(NSS_USE_64) && !defined(__ia64) -#include <unistd.h> - -/* This code tests to see if we're running on a PA2.x CPU. -** It returns true (1) if so, and false (0) otherwise. -*/ -static const char * -getLibName(void) -{ - long cpu = sysconf(_SC_CPU_VERSION); - return (cpu == CPU_PA_RISC2_0) - ? "libfreebl_32fpu_3.sl" - : "libfreebl_32int_3.sl" ; -} -#else -/* default case, for platforms/ABIs that have only one freebl shared lib. */ -static const char * getLibName(void) { return default_name; } -#endif diff --git a/lib/freebl/ctr.c b/lib/freebl/ctr.c index accd55b48..1cbf30c28 100644 --- a/lib/freebl/ctr.c +++ b/lib/freebl/ctr.c @@ -30,7 +30,6 @@ CTR_InitContext(CTRContext *ctr, void *context, freeblCipherFunc cipher, } /* Invariant: 0 < ctr->bufPtr <= blocksize */ - ctr->checkWrap = PR_FALSE; ctr->bufPtr = blocksize; /* no unused data in the buffer */ ctr->cipher = cipher; ctr->context = context; @@ -41,10 +40,6 @@ CTR_InitContext(CTRContext *ctr, void *context, freeblCipherFunc cipher, return SECFailure; } PORT_Memcpy(ctr->counter, ctrParams->cb, blocksize); - if (ctr->counterBits < 64) { - PORT_Memcpy(ctr->counterFirst, ctr->counter, blocksize); - ctr->checkWrap = PR_TRUE; - } return SECSuccess; } @@ -152,12 +147,6 @@ CTR_Update(CTRContext *ctr, unsigned char *outbuf, rv = (*ctr->cipher)(ctr->context, ctr->buffer, &tmp, blocksize, ctr->counter, blocksize, blocksize); ctr_GetNextCtr(ctr->counter, ctr->counterBits, blocksize); - if (ctr->checkWrap) { - if (PORT_Memcmp(ctr->counter, ctr->counterFirst, blocksize) == 0) { - PORT_SetError(SEC_ERROR_INVALID_ARGS); - return SECFailure; - } - } if (rv != SECSuccess) { return SECFailure; } @@ -173,12 +162,6 @@ CTR_Update(CTRContext *ctr, unsigned char *outbuf, rv = (*ctr->cipher)(ctr->context, ctr->buffer, &tmp, blocksize, ctr->counter, blocksize, blocksize); ctr_GetNextCtr(ctr->counter, ctr->counterBits, blocksize); - if (ctr->checkWrap) { - if (PORT_Memcmp(ctr->counter, ctr->counterFirst, blocksize) == 0) { - PORT_SetError(SEC_ERROR_INVALID_ARGS); - return SECFailure; - } - } if (rv != SECSuccess) { return SECFailure; } diff --git a/lib/freebl/ctr.h b/lib/freebl/ctr.h index 14763c6fb..e7645a223 100644 --- a/lib/freebl/ctr.h +++ b/lib/freebl/ctr.h @@ -14,8 +14,6 @@ struct CTRContextStr { void *context; unsigned char counter[MAX_BLOCK_SIZE]; unsigned char buffer[MAX_BLOCK_SIZE]; - unsigned char counterFirst[MAX_BLOCK_SIZE]; /* counter overlfow value */ - PRBool checkWrap; /*check for counter overflow*/ unsigned long counterBits; unsigned int bufPtr; }; diff --git a/lib/freebl/cts.c b/lib/freebl/cts.c index 33c9ccd7a..984e05b95 100644 --- a/lib/freebl/cts.c +++ b/lib/freebl/cts.c @@ -97,7 +97,6 @@ CTS_EncryptUpdate(CTSContext *cts, unsigned char *outbuf, unsigned int tmp; int fullblocks; int written; - unsigned char *saveout = outbuf; SECStatus rv; if (inlen < blocksize) { @@ -142,8 +141,6 @@ CTS_EncryptUpdate(CTSContext *cts, unsigned char *outbuf, PORT_Memset(lastBlock, 0, blocksize); if (rv == SECSuccess) { *outlen = written + blocksize; - } else { - PORT_Memset(saveout, 0, written+blocksize); } return rv; } @@ -187,7 +184,6 @@ CTS_DecryptUpdate(CTSContext *cts, unsigned char *outbuf, unsigned char Cn[MAX_BLOCK_SIZE]; /* block Cn */ unsigned char lastBlock[MAX_BLOCK_SIZE]; const unsigned char *tmp; - unsigned char *saveout = outbuf; unsigned int tmpLen; unsigned int fullblocks, pad; unsigned int i; @@ -284,8 +280,6 @@ CTS_DecryptUpdate(CTSContext *cts, unsigned char *outbuf, rv = (*cts->cipher)(cts->context, Pn, &tmpLen, blocksize, lastBlock, blocksize, blocksize); if (rv != SECSuccess) { - PORT_Memset(lastBlock, 0, blocksize); - PORT_Memset(saveout, 0, *outlen); return SECFailure; } /* make up for the out of order CBC decryption */ diff --git a/lib/freebl/dh.c b/lib/freebl/dh.c index 86ae90e68..66c110134 100644 --- a/lib/freebl/dh.c +++ b/lib/freebl/dh.c @@ -173,8 +173,8 @@ DH_NewKey(DHParams *params, DHPrivateKey **privKey) /* Generate private key xa */ SECITEM_AllocItem(arena, &key->privateValue, dh_GetSecretKeyLen(params->prime.len)); - CHECK_SEC_OK(RNG_GenerateGlobalRandomBytes(key->privateValue.data, - key->privateValue.len)); + RNG_GenerateGlobalRandomBytes(key->privateValue.data, + key->privateValue.len); SECITEM_TO_MPINT( key->privateValue, &xa ); /* xa < p */ CHECK_MPI_OK( mp_mod(&xa, &p, &xa) ); @@ -191,10 +191,8 @@ cleanup: MP_TO_SEC_ERROR(err); rv = SECFailure; } - if (rv) { - *privKey = NULL; + if (rv) PORT_FreeArena(arena, PR_TRUE); - } return rv; } @@ -274,10 +272,6 @@ DH_Derive(SECItem *publicValue, /* allocate a buffer which can hold the entire derived secret. */ secret = PORT_Alloc(len); - if (secret == NULL) { - err = MP_MEM; - goto cleanup; - } /* grab the derived secret */ err = mp_to_unsigned_octets(&ZZ, secret, len); if (err >= 0) err = MP_OKAY; @@ -291,10 +285,7 @@ DH_Derive(SECItem *publicValue, nb = outBytes; else nb = len; - if (SECITEM_AllocItem(NULL, derivedSecret, nb) == NULL) { - err = MP_MEM; - goto cleanup; - } + SECITEM_AllocItem(NULL, derivedSecret, nb); if (len < nb) { unsigned int offset = nb - len; memset(derivedSecret->data, 0, offset); @@ -369,19 +360,11 @@ KEA_Derive(SECItem *prime, /* allocate a buffer for the full derived secret */ len = mp_unsigned_octet_size(&w); secret = PORT_Alloc(len); - if (secret == NULL) { - err = MP_MEM; - goto cleanup; - } /* grab the secret */ err = mp_to_unsigned_octets(&w, secret, len); if (err > 0) err = MP_OKAY; /* allocate output buffer */ - if (SECITEM_AllocItem(NULL, derivedSecret, KEA_DERIVED_SECRET_LEN) - == NULL) { - err = MP_MEM; - goto cleanup; - } + SECITEM_AllocItem(NULL, derivedSecret, KEA_DERIVED_SECRET_LEN); memset(derivedSecret->data, 0, derivedSecret->len); /* copy in the 128 lsb of the secret */ if (len >= KEA_DERIVED_SECRET_LEN) { @@ -404,8 +387,6 @@ cleanup: PORT_ZFree(secret, len); if (err) { MP_TO_SEC_ERROR(err); - if (derivedSecret->data) - PORT_ZFree(derivedSecret->data, derivedSecret->len); return SECFailure; } return SECSuccess; diff --git a/lib/freebl/drbg.c b/lib/freebl/drbg.c index 7797b0170..391d45604 100644 --- a/lib/freebl/drbg.c +++ b/lib/freebl/drbg.c @@ -76,7 +76,7 @@ struct RNGContextStr { #define V(rng) (((rng)->V_Data)+1) #define VSize(rng) ((sizeof (rng)->V_Data) -1) PRUint8 C[PRNG_SEEDLEN]; /* internal state variables */ - PRUint8 lastOutput[SHA256_LENGTH]; /* for continuous rng checking */ + PRUint8 oldV[PRNG_SEEDLEN]; /* for continuous rng checking */ /* If we get calls for the PRNG to return less than the length of our * hash, we extend the request for a full hash (since we'll be doing * the full hash anyway). Future requests for random numbers are fulfilled @@ -286,8 +286,6 @@ prng_Hashgen(RNGContext *rng, PRUint8 *returned_bytes, unsigned int no_of_returned_bytes) { PRUint8 data[VSize(rng)]; - PRUint8 thisHash[SHA256_LENGTH]; - PRUint8 *lastHash = rng->lastOutput; PORT_Memcpy(data, V(rng), VSize(rng)); while (no_of_returned_bytes) { @@ -297,16 +295,7 @@ prng_Hashgen(RNGContext *rng, PRUint8 *returned_bytes, SHA256_Begin(&ctx); SHA256_Update(&ctx, data, sizeof data); - SHA256_End(&ctx, thisHash, &len, SHA256_LENGTH); - if (PORT_Memcmp(lastHash, thisHash, len) == 0) { - rng->isValid = PR_FALSE; - break; - } - if (no_of_returned_bytes < SHA256_LENGTH) { - len = no_of_returned_bytes; - } - PORT_Memcpy(returned_bytes, thisHash, len); - lastHash = returned_bytes; + SHA256_End(&ctx, returned_bytes, &len, no_of_returned_bytes); returned_bytes += len; no_of_returned_bytes -= len; /* The carry parameter is a bool (increment or not). @@ -314,9 +303,7 @@ prng_Hashgen(RNGContext *rng, PRUint8 *returned_bytes, carry = no_of_returned_bytes; PRNG_ADD_CARRY_ONLY(data, (sizeof data)- 1, carry); } - PORT_Memcpy(rng->lastOutput, thisHash, SHA256_LENGTH); PORT_Memset(data, 0, sizeof data); - PORT_Memset(thisHash, 0, sizeof thisHash); } /* @@ -360,13 +347,8 @@ prng_generateNewBytes(RNGContext *rng, } if (no_of_returned_bytes == SHA256_LENGTH) { - /* short_cut to hashbuf and a couple of copies and clears */ + /* short_cut to hashbuf and save a copy and a clear */ SHA256_HashBuf(returned_bytes, V(rng), VSize(rng) ); - /* continuous rng check */ - if (memcmp(rng->lastOutput, returned_bytes, SHA256_LENGTH) == 0) { - rng->isValid = PR_FALSE; - } - PORT_Memcpy(rng->lastOutput, returned_bytes, sizeof rng->lastOutput); } else { prng_Hashgen(rng, returned_bytes, no_of_returned_bytes); } @@ -380,12 +362,13 @@ prng_generateNewBytes(RNGContext *rng, carry = 1; PRNG_ADD_CARRY_ONLY(rng->reseed_counter,(sizeof rng->reseed_counter)-1, carry); - /* if the prng failed, don't return any output, signal softoken */ - if (!rng->isValid) { - PORT_Memset(returned_bytes, 0, no_of_returned_bytes); + /* continuous rng check */ + if (memcmp(V(rng), rng->oldV, sizeof rng->oldV) == 0) { + rng->isValid = PR_FALSE; PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); return SECFailure; } + PORT_Memcpy(rng->oldV, V(rng), sizeof rng->oldV); return SECSuccess; } diff --git a/lib/freebl/ec.c b/lib/freebl/ec.c index 8c05ad759..4435f91ea 100644 --- a/lib/freebl/ec.c +++ b/lib/freebl/ec.c @@ -376,7 +376,7 @@ cleanup: rv = SECFailure; } if (rv != SECSuccess && privKeyBytes) { - PORT_ZFree(privKeyBytes,2*len); + PORT_Free(privKeyBytes); privKeyBytes = NULL; } return privKeyBytes; @@ -1075,7 +1075,7 @@ cleanup: mp_clear(&v); mp_clear(&n); - if (pointC.data) SECITEM_ZfreeItem(&pointC, PR_FALSE); + if (pointC.data) SECITEM_FreeItem(&pointC, PR_FALSE); if (err) { MP_TO_SEC_ERROR(err); rv = SECFailure; diff --git a/lib/freebl/fipsfreebl.c b/lib/freebl/fipsfreebl.c deleted file mode 100644 index 346ac544a..000000000 --- a/lib/freebl/fipsfreebl.c +++ /dev/null @@ -1,1775 +0,0 @@ -/* - * PKCS #11 FIPS Power-Up Self Test. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: fipstest.c,v 1.31 2012/06/28 17:55:06 rrelyea%redhat.com Exp $ */ - -#ifdef FREEBL_NO_DEPEND -#include "stubs.h" -#endif - -#include "blapi.h" -#include "seccomon.h" /* Required for RSA and DSA. */ -#include "secerr.h" -#include "prtypes.h" - -#ifdef NSS_ENABLE_ECC -#include "ec.h" /* Required for ECDSA */ -#endif - -/* - * different platforms have different ways of calling and initial entry point - * when the dll/.so is loaded. Most platforms support either a posix pragma - * or the GCC attribute. Some platforms suppor a pre-defined name, and some - * platforms have a link line way of invoking this function. - */ - -#ifndef NSS_NO_INIT_SUPPORT -/* The pragma */ -#if defined(USE_INIT_PRAGMA) -#pragma init(bl_startup_tests) -#endif - - -/* GCC Attribute */ -#if defined(__GNUC__) -#define INIT_FUNCTION __attribute__((constructor)) -#else -#define INIT_FUNCTION -#endif - -static void INIT_FUNCTION bl_startup_tests(void); - - -/* Windows pre-defined entry */ -#ifdef XP_WIN -#include <windows.h> -#include <primpl.h> - -BOOL WINAPI DllMain( - HINSTANCE hinstDLL, // handle to DLL module - DWORD fdwReason, // reason for calling function - LPVOID lpReserved ) // reserved -{ - // Perform actions based on the reason for calling. - switch( fdwReason ) - { - case DLL_PROCESS_ATTACH: - // Initialize once for each new process. - // Return FALSE to fail DLL load. - bl_startup_tests(); - break; - - case DLL_THREAD_ATTACH: - // Do thread-specific initialization. - break; - - case DLL_THREAD_DETACH: - // Do thread-specific cleanup. - break; - - case DLL_PROCESS_DETACH: - // Perform any necessary cleanup. - break; - } - return TRUE; // Successful DLL_PROCESS_ATTACH. -} -#endif -#endif /* !NSS_NO_INIT_SUPPORT */ - -/* insert other platform dependent init entry points here, or modify - * the linker line */ - - -/* FIPS preprocessor directives for RC2-ECB and RC2-CBC. */ -#define FIPS_RC2_KEY_LENGTH 5 /* 40-bits */ -#define FIPS_RC2_ENCRYPT_LENGTH 8 /* 64-bits */ -#define FIPS_RC2_DECRYPT_LENGTH 8 /* 64-bits */ - - -/* FIPS preprocessor directives for RC4. */ -#define FIPS_RC4_KEY_LENGTH 5 /* 40-bits */ -#define FIPS_RC4_ENCRYPT_LENGTH 8 /* 64-bits */ -#define FIPS_RC4_DECRYPT_LENGTH 8 /* 64-bits */ - - -/* FIPS preprocessor directives for DES-ECB and DES-CBC. */ -#define FIPS_DES_ENCRYPT_LENGTH 8 /* 64-bits */ -#define FIPS_DES_DECRYPT_LENGTH 8 /* 64-bits */ - - -/* FIPS preprocessor directives for DES3-CBC and DES3-ECB. */ -#define FIPS_DES3_ENCRYPT_LENGTH 8 /* 64-bits */ -#define FIPS_DES3_DECRYPT_LENGTH 8 /* 64-bits */ - - -/* FIPS preprocessor directives for AES-ECB and AES-CBC. */ -#define FIPS_AES_BLOCK_SIZE 16 /* 128-bits */ -#define FIPS_AES_ENCRYPT_LENGTH 16 /* 128-bits */ -#define FIPS_AES_DECRYPT_LENGTH 16 /* 128-bits */ -#define FIPS_AES_128_KEY_SIZE 16 /* 128-bits */ -#define FIPS_AES_192_KEY_SIZE 24 /* 192-bits */ -#define FIPS_AES_256_KEY_SIZE 32 /* 256-bits */ - - -/* FIPS preprocessor directives for message digests */ -#define FIPS_KNOWN_HASH_MESSAGE_LENGTH 64 /* 512-bits */ - - -/* FIPS preprocessor directives for RSA. */ -#define FIPS_RSA_TYPE siBuffer -#define FIPS_RSA_PUBLIC_EXPONENT_LENGTH 3 /* 24-bits */ -#define FIPS_RSA_PRIVATE_VERSION_LENGTH 1 /* 8-bits */ -#define FIPS_RSA_MESSAGE_LENGTH 256 /* 2048-bits */ -#define FIPS_RSA_COEFFICIENT_LENGTH 128 /* 1024-bits */ -#define FIPS_RSA_PRIME0_LENGTH 128 /* 1024-bits */ -#define FIPS_RSA_PRIME1_LENGTH 128 /* 1024-bits */ -#define FIPS_RSA_EXPONENT0_LENGTH 128 /* 1024-bits */ -#define FIPS_RSA_EXPONENT1_LENGTH 128 /* 1024-bits */ -#define FIPS_RSA_PRIVATE_EXPONENT_LENGTH 256 /* 2048-bits */ -#define FIPS_RSA_ENCRYPT_LENGTH 256 /* 2048-bits */ -#define FIPS_RSA_DECRYPT_LENGTH 256 /* 2048-bits */ -#define FIPS_RSA_SIGNATURE_LENGTH 256 /* 2048-bits */ -#define FIPS_RSA_MODULUS_LENGTH 256 /* 2048-bits */ - - -/* FIPS preprocessor directives for DSA. */ -#define FIPS_DSA_TYPE siBuffer -#define FIPS_DSA_DIGEST_LENGTH 20 /* 160-bits */ -#define FIPS_DSA_SUBPRIME_LENGTH 20 /* 160-bits */ -#define FIPS_DSA_SIGNATURE_LENGTH 40 /* 320-bits */ -#define FIPS_DSA_PRIME_LENGTH 128 /* 1024-bits */ -#define FIPS_DSA_BASE_LENGTH 128 /* 1024-bits */ - -/* FIPS preprocessor directives for RNG. */ -#define FIPS_RNG_XKEY_LENGTH 32 /* 256-bits */ - -static SECStatus -freebl_fips_DES3_PowerUpSelfTest( void ) -{ - /* DES3 Known Key (56-bits). */ - static const PRUint8 des3_known_key[] = { "ANSI Triple-DES Key Data" }; - - /* DES3-CBC Known Initialization Vector (64-bits). */ - static const PRUint8 des3_cbc_known_initialization_vector[] = { "Security" }; - - /* DES3 Known Plaintext (64-bits). */ - static const PRUint8 des3_ecb_known_plaintext[] = { "Netscape" }; - static const PRUint8 des3_cbc_known_plaintext[] = { "Netscape" }; - - /* DES3 Known Ciphertext (64-bits). */ - static const PRUint8 des3_ecb_known_ciphertext[] = { - 0x55,0x8e,0xad,0x3c,0xee,0x49,0x69,0xbe}; - static const PRUint8 des3_cbc_known_ciphertext[] = { - 0x43,0xdc,0x6a,0xc1,0xaf,0xa6,0x32,0xf5}; - - /* DES3 variables. */ - PRUint8 des3_computed_ciphertext[FIPS_DES3_ENCRYPT_LENGTH]; - PRUint8 des3_computed_plaintext[FIPS_DES3_DECRYPT_LENGTH]; - DESContext * des3_context; - unsigned int des3_bytes_encrypted; - unsigned int des3_bytes_decrypted; - SECStatus des3_status; - - - /*******************************************************/ - /* DES3-ECB Single-Round Known Answer Encryption Test. */ - /*******************************************************/ - - des3_context = DES_CreateContext( des3_known_key, NULL, - NSS_DES_EDE3, PR_TRUE ); - - if( des3_context == NULL ) { - PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); - } - - des3_status = DES_Encrypt( des3_context, des3_computed_ciphertext, - &des3_bytes_encrypted, FIPS_DES3_ENCRYPT_LENGTH, - des3_ecb_known_plaintext, - FIPS_DES3_DECRYPT_LENGTH ); - - DES_DestroyContext( des3_context, PR_TRUE ); - - if( ( des3_status != SECSuccess ) || - ( des3_bytes_encrypted != FIPS_DES3_ENCRYPT_LENGTH ) || - ( PORT_Memcmp( des3_computed_ciphertext, des3_ecb_known_ciphertext, - FIPS_DES3_ENCRYPT_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - - /*******************************************************/ - /* DES3-ECB Single-Round Known Answer Decryption Test. */ - /*******************************************************/ - - des3_context = DES_CreateContext( des3_known_key, NULL, - NSS_DES_EDE3, PR_FALSE ); - - if( des3_context == NULL ) { - PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); - } - - des3_status = DES_Decrypt( des3_context, des3_computed_plaintext, - &des3_bytes_decrypted, FIPS_DES3_DECRYPT_LENGTH, - des3_ecb_known_ciphertext, - FIPS_DES3_ENCRYPT_LENGTH ); - - DES_DestroyContext( des3_context, PR_TRUE ); - - if( ( des3_status != SECSuccess ) || - ( des3_bytes_decrypted != FIPS_DES3_DECRYPT_LENGTH ) || - ( PORT_Memcmp( des3_computed_plaintext, des3_ecb_known_plaintext, - FIPS_DES3_DECRYPT_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - - /*******************************************************/ - /* DES3-CBC Single-Round Known Answer Encryption Test. */ - /*******************************************************/ - - des3_context = DES_CreateContext( des3_known_key, - des3_cbc_known_initialization_vector, - NSS_DES_EDE3_CBC, PR_TRUE ); - - if( des3_context == NULL ) { - PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); - } - - des3_status = DES_Encrypt( des3_context, des3_computed_ciphertext, - &des3_bytes_encrypted, FIPS_DES3_ENCRYPT_LENGTH, - des3_cbc_known_plaintext, - FIPS_DES3_DECRYPT_LENGTH ); - - DES_DestroyContext( des3_context, PR_TRUE ); - - if( ( des3_status != SECSuccess ) || - ( des3_bytes_encrypted != FIPS_DES3_ENCRYPT_LENGTH ) || - ( PORT_Memcmp( des3_computed_ciphertext, des3_cbc_known_ciphertext, - FIPS_DES3_ENCRYPT_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - - /*******************************************************/ - /* DES3-CBC Single-Round Known Answer Decryption Test. */ - /*******************************************************/ - - des3_context = DES_CreateContext( des3_known_key, - des3_cbc_known_initialization_vector, - NSS_DES_EDE3_CBC, PR_FALSE ); - - if( des3_context == NULL ) { - PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); - } - - des3_status = DES_Decrypt( des3_context, des3_computed_plaintext, - &des3_bytes_decrypted, FIPS_DES3_DECRYPT_LENGTH, - des3_cbc_known_ciphertext, - FIPS_DES3_ENCRYPT_LENGTH ); - - DES_DestroyContext( des3_context, PR_TRUE ); - - if( ( des3_status != SECSuccess ) || - ( des3_bytes_decrypted != FIPS_DES3_DECRYPT_LENGTH ) || - ( PORT_Memcmp( des3_computed_plaintext, des3_cbc_known_plaintext, - FIPS_DES3_DECRYPT_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - return( SECSuccess ); -} - - -/* AES self-test for 128-bit, 192-bit, or 256-bit key sizes*/ -static SECStatus -freebl_fips_AES_PowerUpSelfTest( int aes_key_size ) -{ - /* AES Known Key (up to 256-bits). */ - static const PRUint8 aes_known_key[] = - { "AES-128 RIJNDAELLEADNJIR 821-SEA" }; - - /* AES-CBC Known Initialization Vector (128-bits). */ - static const PRUint8 aes_cbc_known_initialization_vector[] = - { "SecurityytiruceS" }; - - /* AES Known Plaintext (128-bits). (blocksize is 128-bits) */ - static const PRUint8 aes_known_plaintext[] = { "NetscapeepacsteN" }; - - /* AES Known Ciphertext (128-bit key). */ - static const PRUint8 aes_ecb128_known_ciphertext[] = { - 0x3c,0xa5,0x96,0xf3,0x34,0x6a,0x96,0xc1, - 0x03,0x88,0x16,0x7b,0x20,0xbf,0x35,0x47 }; - - static const PRUint8 aes_cbc128_known_ciphertext[] = { - 0xcf,0x15,0x1d,0x4f,0x96,0xe4,0x4f,0x63, - 0x15,0x54,0x14,0x1d,0x4e,0xd8,0xd5,0xea }; - - /* AES Known Ciphertext (192-bit key). */ - static const PRUint8 aes_ecb192_known_ciphertext[] = { - 0xa0,0x18,0x62,0xed,0x88,0x19,0xcb,0x62, - 0x88,0x1d,0x4d,0xfe,0x84,0x02,0x89,0x0e }; - - static const PRUint8 aes_cbc192_known_ciphertext[] = { - 0x83,0xf7,0xa4,0x76,0xd1,0x6f,0x07,0xbe, - 0x07,0xbc,0x43,0x2f,0x6d,0xad,0x29,0xe1 }; - - /* AES Known Ciphertext (256-bit key). */ - static const PRUint8 aes_ecb256_known_ciphertext[] = { - 0xdb,0xa6,0x52,0x01,0x8a,0x70,0xae,0x66, - 0x3a,0x99,0xd8,0x95,0x7f,0xfb,0x01,0x67 }; - - static const PRUint8 aes_cbc256_known_ciphertext[] = { - 0x37,0xea,0x07,0x06,0x31,0x1c,0x59,0x27, - 0xc5,0xc5,0x68,0x71,0x6e,0x34,0x40,0x16 }; - - const PRUint8 *aes_ecb_known_ciphertext = - ( aes_key_size == FIPS_AES_128_KEY_SIZE) ? aes_ecb128_known_ciphertext : - ( aes_key_size == FIPS_AES_192_KEY_SIZE) ? aes_ecb192_known_ciphertext : - aes_ecb256_known_ciphertext; - - const PRUint8 *aes_cbc_known_ciphertext = - ( aes_key_size == FIPS_AES_128_KEY_SIZE) ? aes_cbc128_known_ciphertext : - ( aes_key_size == FIPS_AES_192_KEY_SIZE) ? aes_cbc192_known_ciphertext : - aes_cbc256_known_ciphertext; - - /* AES variables. */ - PRUint8 aes_computed_ciphertext[FIPS_AES_ENCRYPT_LENGTH]; - PRUint8 aes_computed_plaintext[FIPS_AES_DECRYPT_LENGTH]; - AESContext * aes_context; - unsigned int aes_bytes_encrypted; - unsigned int aes_bytes_decrypted; - SECStatus aes_status; - - /*check if aes_key_size is 128, 192, or 256 bits */ - if ((aes_key_size != FIPS_AES_128_KEY_SIZE) && - (aes_key_size != FIPS_AES_192_KEY_SIZE) && - (aes_key_size != FIPS_AES_256_KEY_SIZE)) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - /******************************************************/ - /* AES-ECB Single-Round Known Answer Encryption Test: */ - /******************************************************/ - - aes_context = AES_CreateContext( aes_known_key, NULL, NSS_AES, PR_TRUE, - aes_key_size, FIPS_AES_BLOCK_SIZE ); - - if( aes_context == NULL ) { - PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); - } - - aes_status = AES_Encrypt( aes_context, aes_computed_ciphertext, - &aes_bytes_encrypted, FIPS_AES_ENCRYPT_LENGTH, - aes_known_plaintext, - FIPS_AES_DECRYPT_LENGTH ); - - AES_DestroyContext( aes_context, PR_TRUE ); - - if( ( aes_status != SECSuccess ) || - ( aes_bytes_encrypted != FIPS_AES_ENCRYPT_LENGTH ) || - ( PORT_Memcmp( aes_computed_ciphertext, aes_ecb_known_ciphertext, - FIPS_AES_ENCRYPT_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - - /******************************************************/ - /* AES-ECB Single-Round Known Answer Decryption Test: */ - /******************************************************/ - - aes_context = AES_CreateContext( aes_known_key, NULL, NSS_AES, PR_FALSE, - aes_key_size, FIPS_AES_BLOCK_SIZE ); - - if( aes_context == NULL ) { - PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); - } - - aes_status = AES_Decrypt( aes_context, aes_computed_plaintext, - &aes_bytes_decrypted, FIPS_AES_DECRYPT_LENGTH, - aes_ecb_known_ciphertext, - FIPS_AES_ENCRYPT_LENGTH ); - - AES_DestroyContext( aes_context, PR_TRUE ); - - if( ( aes_status != SECSuccess ) || - ( aes_bytes_decrypted != FIPS_AES_DECRYPT_LENGTH ) || - ( PORT_Memcmp( aes_computed_plaintext, aes_known_plaintext, - FIPS_AES_DECRYPT_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - - /******************************************************/ - /* AES-CBC Single-Round Known Answer Encryption Test. */ - /******************************************************/ - - aes_context = AES_CreateContext( aes_known_key, - aes_cbc_known_initialization_vector, - NSS_AES_CBC, PR_TRUE, aes_key_size, - FIPS_AES_BLOCK_SIZE ); - - if( aes_context == NULL ) { - PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); - } - - aes_status = AES_Encrypt( aes_context, aes_computed_ciphertext, - &aes_bytes_encrypted, FIPS_AES_ENCRYPT_LENGTH, - aes_known_plaintext, - FIPS_AES_DECRYPT_LENGTH ); - - AES_DestroyContext( aes_context, PR_TRUE ); - - if( ( aes_status != SECSuccess ) || - ( aes_bytes_encrypted != FIPS_AES_ENCRYPT_LENGTH ) || - ( PORT_Memcmp( aes_computed_ciphertext, aes_cbc_known_ciphertext, - FIPS_AES_ENCRYPT_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - - /******************************************************/ - /* AES-CBC Single-Round Known Answer Decryption Test. */ - /******************************************************/ - - aes_context = AES_CreateContext( aes_known_key, - aes_cbc_known_initialization_vector, - NSS_AES_CBC, PR_FALSE, aes_key_size, - FIPS_AES_BLOCK_SIZE ); - - if( aes_context == NULL ) { - PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); - } - - aes_status = AES_Decrypt( aes_context, aes_computed_plaintext, - &aes_bytes_decrypted, FIPS_AES_DECRYPT_LENGTH, - aes_cbc_known_ciphertext, - FIPS_AES_ENCRYPT_LENGTH ); - - AES_DestroyContext( aes_context, PR_TRUE ); - - if( ( aes_status != SECSuccess ) || - ( aes_bytes_decrypted != FIPS_AES_DECRYPT_LENGTH ) || - ( PORT_Memcmp( aes_computed_plaintext, aes_known_plaintext, - FIPS_AES_DECRYPT_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - return( SECSuccess ); -} - -/* Known Hash Message (512-bits). Used for all hashes (incl. SHA-N [N>1]). */ -static const PRUint8 known_hash_message[] = { - "The test message for the MD2, MD5, and SHA-1 hashing algorithms." }; - -/****************************************************/ -/* Single Round HMAC SHA-X test */ -/****************************************************/ -static SECStatus -freebl_fips_HMAC(unsigned char *hmac_computed, - const PRUint8 *secret_key, - unsigned int secret_key_length, - const PRUint8 *message, - unsigned int message_length, - HASH_HashType hashAlg ) -{ - SECStatus hmac_status = SECFailure; - HMACContext *cx = NULL; - SECHashObject *hashObj = NULL; - unsigned int bytes_hashed = 0; - - hashObj = (SECHashObject *) HASH_GetRawHashObject(hashAlg); - - if (!hashObj) - return( SECFailure ); - - cx = HMAC_Create(hashObj, secret_key, - secret_key_length, - PR_TRUE); /* PR_TRUE for in FIPS mode */ - - if (cx == NULL) - return( SECFailure ); - - HMAC_Begin(cx); - HMAC_Update(cx, message, message_length); - hmac_status = HMAC_Finish(cx, hmac_computed, &bytes_hashed, - hashObj->length); - - HMAC_Destroy(cx, PR_TRUE); - - return( hmac_status ); -} - -static SECStatus -freebl_fips_HMAC_PowerUpSelfTest( void ) -{ - static const PRUint8 HMAC_known_secret_key[] = { - "Firefox and ThunderBird are awesome!"}; - - static const PRUint8 HMAC_known_secret_key_length - = sizeof HMAC_known_secret_key; - - /* known SHA1 hmac (20 bytes) */ - static const PRUint8 known_SHA1_hmac[] = { - 0xd5, 0x85, 0xf6, 0x5b, 0x39, 0xfa, 0xb9, 0x05, - 0x3b, 0x57, 0x1d, 0x61, 0xe7, 0xb8, 0x84, 0x1e, - 0x5d, 0x0e, 0x1e, 0x11}; - - /* known SHA224 hmac (28 bytes) */ - static const PRUint8 known_SHA224_hmac[] = { - 0x1c, 0xc3, 0x06, 0x8e, 0xce, 0x37, 0x68, 0xfb, - 0x1a, 0x82, 0x4a, 0xbe, 0x2b, 0x00, 0x51, 0xf8, - 0x9d, 0xb6, 0xe0, 0x90, 0x0d, 0x00, 0xc9, 0x64, - 0x9a, 0xb8, 0x98, 0x4e}; - - /* known SHA256 hmac (32 bytes) */ - static const PRUint8 known_SHA256_hmac[] = { - 0x05, 0x75, 0x9a, 0x9e, 0x70, 0x5e, 0xe7, 0x44, - 0xe2, 0x46, 0x4b, 0x92, 0x22, 0x14, 0x22, 0xe0, - 0x1b, 0x92, 0x8a, 0x0c, 0xfe, 0xf5, 0x49, 0xe9, - 0xa7, 0x1b, 0x56, 0x7d, 0x1d, 0x29, 0x40, 0x48}; - - /* known SHA384 hmac (48 bytes) */ - static const PRUint8 known_SHA384_hmac[] = { - 0xcd, 0x56, 0x14, 0xec, 0x05, 0x53, 0x06, 0x2b, - 0x7e, 0x9c, 0x8a, 0x18, 0x5e, 0xea, 0xf3, 0x91, - 0x33, 0xfb, 0x64, 0xf6, 0xe3, 0x9f, 0x89, 0x0b, - 0xaf, 0xbe, 0x83, 0x4d, 0x3f, 0x3c, 0x43, 0x4d, - 0x4a, 0x0c, 0x56, 0x98, 0xf8, 0xca, 0xb4, 0xaa, - 0x9a, 0xf4, 0x0a, 0xaf, 0x4f, 0x69, 0xca, 0x87}; - - /* known SHA512 hmac (64 bytes) */ - static const PRUint8 known_SHA512_hmac[] = { - 0xf6, 0x0e, 0x97, 0x12, 0x00, 0x67, 0x6e, 0xb9, - 0x0c, 0xb2, 0x63, 0xf0, 0x60, 0xac, 0x75, 0x62, - 0x70, 0x95, 0x2a, 0x52, 0x22, 0xee, 0xdd, 0xd2, - 0x71, 0xb1, 0xe8, 0x26, 0x33, 0xd3, 0x13, 0x27, - 0xcb, 0xff, 0x44, 0xef, 0x87, 0x97, 0x16, 0xfb, - 0xd3, 0x0b, 0x48, 0xbe, 0x12, 0x4e, 0xda, 0xb1, - 0x89, 0x90, 0xfb, 0x06, 0x0c, 0xbe, 0xe5, 0xc4, - 0xff, 0x24, 0x37, 0x3d, 0xc7, 0xe4, 0xe4, 0x37}; - - SECStatus hmac_status; - PRUint8 hmac_computed[HASH_LENGTH_MAX]; - - /***************************************************/ - /* HMAC SHA-1 Single-Round Known Answer HMAC Test. */ - /***************************************************/ - - hmac_status = freebl_fips_HMAC(hmac_computed, - HMAC_known_secret_key, - HMAC_known_secret_key_length, - known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH, - HASH_AlgSHA1); - - if( ( hmac_status != SECSuccess ) || - ( PORT_Memcmp( hmac_computed, known_SHA1_hmac, - SHA1_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - /***************************************************/ - /* HMAC SHA-224 Single-Round Known Answer Test. */ - /***************************************************/ - - hmac_status = freebl_fips_HMAC(hmac_computed, - HMAC_known_secret_key, - HMAC_known_secret_key_length, - known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH, - HASH_AlgSHA224); - - if( ( hmac_status != SECSuccess ) || - ( PORT_Memcmp( hmac_computed, known_SHA224_hmac, - SHA224_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - /***************************************************/ - /* HMAC SHA-256 Single-Round Known Answer Test. */ - /***************************************************/ - - hmac_status = freebl_fips_HMAC(hmac_computed, - HMAC_known_secret_key, - HMAC_known_secret_key_length, - known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH, - HASH_AlgSHA256); - - if( ( hmac_status != SECSuccess ) || - ( PORT_Memcmp( hmac_computed, known_SHA256_hmac, - SHA256_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - /***************************************************/ - /* HMAC SHA-384 Single-Round Known Answer Test. */ - /***************************************************/ - - hmac_status = freebl_fips_HMAC(hmac_computed, - HMAC_known_secret_key, - HMAC_known_secret_key_length, - known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH, - HASH_AlgSHA384); - - if( ( hmac_status != SECSuccess ) || - ( PORT_Memcmp( hmac_computed, known_SHA384_hmac, - SHA384_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - /***************************************************/ - /* HMAC SHA-512 Single-Round Known Answer Test. */ - /***************************************************/ - - hmac_status = freebl_fips_HMAC(hmac_computed, - HMAC_known_secret_key, - HMAC_known_secret_key_length, - known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH, - HASH_AlgSHA512); - - if( ( hmac_status != SECSuccess ) || - ( PORT_Memcmp( hmac_computed, known_SHA512_hmac, - SHA512_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - return( SECSuccess ); -} - -static SECStatus -freebl_fips_SHA_PowerUpSelfTest( void ) -{ - /* SHA-1 Known Digest Message (160-bits). */ - static const PRUint8 sha1_known_digest[] = { - 0x0a,0x6d,0x07,0xba,0x1e,0xbd,0x8a,0x1b, - 0x72,0xf6,0xc7,0x22,0xf1,0x27,0x9f,0xf0, - 0xe0,0x68,0x47,0x7a}; - - /* SHA-224 Known Digest Message (224-bits). */ - static const PRUint8 sha224_known_digest[] = { - 0x89,0x5e,0x7f,0xfd,0x0e,0xd8,0x35,0x6f, - 0x64,0x6d,0xf2,0xde,0x5e,0xed,0xa6,0x7f, - 0x29,0xd1,0x12,0x73,0x42,0x84,0x95,0x4f, - 0x8e,0x08,0xe5,0xcb}; - - /* SHA-256 Known Digest Message (256-bits). */ - static const PRUint8 sha256_known_digest[] = { - 0x38,0xa9,0xc1,0xf0,0x35,0xf6,0x5d,0x61, - 0x11,0xd4,0x0b,0xdc,0xce,0x35,0x14,0x8d, - 0xf2,0xdd,0xaf,0xaf,0xcf,0xb7,0x87,0xe9, - 0x96,0xa5,0xd2,0x83,0x62,0x46,0x56,0x79}; - - /* SHA-384 Known Digest Message (384-bits). */ - static const PRUint8 sha384_known_digest[] = { - 0x11,0xfe,0x1c,0x00,0x89,0x48,0xde,0xb3, - 0x99,0xee,0x1c,0x18,0xb4,0x10,0xfb,0xfe, - 0xe3,0xa8,0x2c,0xf3,0x04,0xb0,0x2f,0xc8, - 0xa3,0xc4,0x5e,0xea,0x7e,0x60,0x48,0x7b, - 0xce,0x2c,0x62,0xf7,0xbc,0xa7,0xe8,0xa3, - 0xcf,0x24,0xce,0x9c,0xe2,0x8b,0x09,0x72}; - - /* SHA-512 Known Digest Message (512-bits). */ - static const PRUint8 sha512_known_digest[] = { - 0xc8,0xb3,0x27,0xf9,0x0b,0x24,0xc8,0xbf, - 0x4c,0xba,0x33,0x54,0xf2,0x31,0xbf,0xdb, - 0xab,0xfd,0xb3,0x15,0xd7,0xfa,0x48,0x99, - 0x07,0x60,0x0f,0x57,0x41,0x1a,0xdd,0x28, - 0x12,0x55,0x25,0xac,0xba,0x3a,0x99,0x12, - 0x2c,0x7a,0x8f,0x75,0x3a,0xe1,0x06,0x6f, - 0x30,0x31,0xc9,0x33,0xc6,0x1b,0x90,0x1a, - 0x6c,0x98,0x9a,0x87,0xd0,0xb2,0xf8,0x07}; - - /* SHA-X variables. */ - PRUint8 sha_computed_digest[HASH_LENGTH_MAX]; - SECStatus sha_status; - - /*************************************************/ - /* SHA-1 Single-Round Known Answer Hashing Test. */ - /*************************************************/ - - sha_status = SHA1_HashBuf( sha_computed_digest, known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH ); - - if( ( sha_status != SECSuccess ) || - ( PORT_Memcmp( sha_computed_digest, sha1_known_digest, - SHA1_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - /***************************************************/ - /* SHA-224 Single-Round Known Answer Hashing Test. */ - /***************************************************/ - - sha_status = SHA224_HashBuf( sha_computed_digest, known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH ); - - if( ( sha_status != SECSuccess ) || - ( PORT_Memcmp( sha_computed_digest, sha224_known_digest, - SHA224_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - /***************************************************/ - /* SHA-256 Single-Round Known Answer Hashing Test. */ - /***************************************************/ - - sha_status = SHA256_HashBuf( sha_computed_digest, known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH ); - - if( ( sha_status != SECSuccess ) || - ( PORT_Memcmp( sha_computed_digest, sha256_known_digest, - SHA256_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - /***************************************************/ - /* SHA-384 Single-Round Known Answer Hashing Test. */ - /***************************************************/ - - sha_status = SHA384_HashBuf( sha_computed_digest, known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH ); - - if( ( sha_status != SECSuccess ) || - ( PORT_Memcmp( sha_computed_digest, sha384_known_digest, - SHA384_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - /***************************************************/ - /* SHA-512 Single-Round Known Answer Hashing Test. */ - /***************************************************/ - - sha_status = SHA512_HashBuf( sha_computed_digest, known_hash_message, - FIPS_KNOWN_HASH_MESSAGE_LENGTH ); - - if( ( sha_status != SECSuccess ) || - ( PORT_Memcmp( sha_computed_digest, sha512_known_digest, - SHA512_LENGTH ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - return( SECSuccess ); -} - - -static SECStatus -freebl_fips_RSA_PowerUpSelfTest( void ) -{ - /* RSA Known Modulus used in both Public/Private Key Values (2048-bits). */ - static const PRUint8 rsa_modulus[FIPS_RSA_MODULUS_LENGTH] = { - 0xb8, 0x15, 0x00, 0x33, 0xda, 0x0c, 0x9d, 0xa5, - 0x14, 0x8c, 0xde, 0x1f, 0x23, 0x07, 0x54, 0xe2, - 0xc6, 0xb9, 0x51, 0x04, 0xc9, 0x65, 0x24, 0x6e, - 0x0a, 0x46, 0x34, 0x5c, 0x37, 0x86, 0x6b, 0x88, - 0x24, 0x27, 0xac, 0xa5, 0x02, 0x79, 0xfb, 0xed, - 0x75, 0xc5, 0x3f, 0x6e, 0xdf, 0x05, 0x5f, 0x0f, - 0x20, 0x70, 0xa0, 0x5b, 0x85, 0xdb, 0xac, 0xb9, - 0x5f, 0x02, 0xc2, 0x64, 0x1e, 0x84, 0x5b, 0x3e, - 0xad, 0xbf, 0xf6, 0x2e, 0x51, 0xd6, 0xad, 0xf7, - 0xa7, 0x86, 0x75, 0x86, 0xec, 0xa7, 0xe1, 0xf7, - 0x08, 0xbf, 0xdc, 0x56, 0xb1, 0x3b, 0xca, 0xd8, - 0xfc, 0x51, 0xdf, 0x9a, 0x2a, 0x37, 0x06, 0xf2, - 0xd1, 0x6b, 0x9a, 0x5e, 0x2a, 0xe5, 0x20, 0x57, - 0x35, 0x9f, 0x1f, 0x98, 0xcf, 0x40, 0xc7, 0xd6, - 0x98, 0xdb, 0xde, 0xf5, 0x64, 0x53, 0xf7, 0x9d, - 0x45, 0xf3, 0xd6, 0x78, 0xb9, 0xe3, 0xa3, 0x20, - 0xcd, 0x79, 0x43, 0x35, 0xef, 0xd7, 0xfb, 0xb9, - 0x80, 0x88, 0x27, 0x2f, 0x63, 0xa8, 0x67, 0x3d, - 0x4a, 0xfa, 0x06, 0xc6, 0xd2, 0x86, 0x0b, 0xa7, - 0x28, 0xfd, 0xe0, 0x1e, 0x93, 0x4b, 0x17, 0x2e, - 0xb0, 0x11, 0x6f, 0xc6, 0x2b, 0x98, 0x0f, 0x15, - 0xe3, 0x87, 0x16, 0x7a, 0x7c, 0x67, 0x3e, 0x12, - 0x2b, 0xf8, 0xbe, 0x48, 0xc1, 0x97, 0x47, 0xf4, - 0x1f, 0x81, 0x80, 0x12, 0x28, 0xe4, 0x7b, 0x1e, - 0xb7, 0x00, 0xa4, 0xde, 0xaa, 0xfb, 0x0f, 0x77, - 0x84, 0xa3, 0xd6, 0xb2, 0x03, 0x48, 0xdd, 0x53, - 0x8b, 0x46, 0x41, 0x28, 0x52, 0xc4, 0x53, 0xf0, - 0x1c, 0x95, 0xd9, 0x36, 0xe0, 0x0f, 0x26, 0x46, - 0x9c, 0x61, 0x0e, 0x80, 0xca, 0x86, 0xaf, 0x39, - 0x95, 0xe5, 0x60, 0x43, 0x61, 0x3e, 0x2b, 0xb4, - 0xe8, 0xbd, 0x8d, 0x77, 0x62, 0xf5, 0x32, 0x43, - 0x2f, 0x4b, 0x65, 0x82, 0x14, 0xdd, 0x29, 0x5b}; - - /* RSA Known Public Key Values (24-bits). */ - static const PRUint8 rsa_public_exponent[FIPS_RSA_PUBLIC_EXPONENT_LENGTH] - = { 0x01, 0x00, 0x01 }; - /* RSA Known Private Key Values (version is 8-bits), */ - /* (private exponent is 2048-bits), */ - /* (private prime0 is 1024-bits), */ - /* (private prime1 is 1024-bits), */ - /* (private prime exponent0 is 1024-bits), */ - /* (private prime exponent1 is 1024-bits), */ - /* and (private coefficient is 1024-bits). */ - static const PRUint8 rsa_version[] = { 0x00 }; - - static const PRUint8 rsa_private_exponent[FIPS_RSA_PRIVATE_EXPONENT_LENGTH] - = {0x29, 0x08, 0x05, 0x53, 0x89, 0x76, 0xe6, 0x6c, - 0xb5, 0x77, 0xf0, 0xca, 0xdf, 0xf3, 0xf2, 0x67, - 0xda, 0x03, 0xd4, 0x9b, 0x4c, 0x88, 0xce, 0xe5, - 0xf8, 0x44, 0x4d, 0xc7, 0x80, 0x58, 0xe5, 0xff, - 0x22, 0x8f, 0xf5, 0x5b, 0x92, 0x81, 0xbe, 0x35, - 0xdf, 0xda, 0x67, 0x99, 0x3e, 0xfc, 0xe3, 0x83, - 0x6b, 0xa7, 0xaf, 0x16, 0xb7, 0x6f, 0x8f, 0xc0, - 0x81, 0xfd, 0x0b, 0x77, 0x65, 0x95, 0xfb, 0x00, - 0xad, 0x99, 0xec, 0x35, 0xc6, 0xe8, 0x23, 0x3e, - 0xe0, 0x88, 0x88, 0x09, 0xdb, 0x16, 0x50, 0xb7, - 0xcf, 0xab, 0x74, 0x61, 0x9e, 0x7f, 0xc5, 0x67, - 0x38, 0x56, 0xc7, 0x90, 0x85, 0x78, 0x5e, 0x84, - 0x21, 0x49, 0xea, 0xce, 0xb2, 0xa0, 0xff, 0xe4, - 0x70, 0x7f, 0x57, 0x7b, 0xa8, 0x36, 0xb8, 0x54, - 0x8d, 0x1d, 0xf5, 0x44, 0x9d, 0x68, 0x59, 0xf9, - 0x24, 0x6e, 0x85, 0x8f, 0xc3, 0x5f, 0x8a, 0x2c, - 0x94, 0xb7, 0xbc, 0x0e, 0xa5, 0xef, 0x93, 0x06, - 0x38, 0xcd, 0x07, 0x0c, 0xae, 0xb8, 0x44, 0x1a, - 0xd8, 0xe7, 0xf5, 0x9a, 0x1e, 0x9c, 0x18, 0xc7, - 0x6a, 0xc2, 0x7f, 0x28, 0x01, 0x4f, 0xb4, 0xb8, - 0x90, 0x97, 0x5a, 0x43, 0x38, 0xad, 0xe8, 0x95, - 0x68, 0x83, 0x1a, 0x1b, 0x10, 0x07, 0xe6, 0x02, - 0x52, 0x1f, 0xbf, 0x76, 0x6b, 0x46, 0xd6, 0xfb, - 0xc3, 0xbe, 0xb5, 0xac, 0x52, 0x53, 0x01, 0x1c, - 0xf3, 0xc5, 0xeb, 0x64, 0xf2, 0x1e, 0xc4, 0x38, - 0xe9, 0xaa, 0xd9, 0xc3, 0x72, 0x51, 0xa5, 0x44, - 0x58, 0x69, 0x0b, 0x1b, 0x98, 0x7f, 0xf2, 0x23, - 0xff, 0xeb, 0xf0, 0x75, 0x24, 0xcf, 0xc5, 0x1e, - 0xb8, 0x6a, 0xc5, 0x2f, 0x4f, 0x23, 0x50, 0x7d, - 0x15, 0x9d, 0x19, 0x7a, 0x0b, 0x82, 0xe0, 0x21, - 0x5b, 0x5f, 0x9d, 0x50, 0x2b, 0x83, 0xe4, 0x48, - 0xcc, 0x39, 0xe5, 0xfb, 0x13, 0x7b, 0x6f, 0x81 }; - - static const PRUint8 rsa_prime0[FIPS_RSA_PRIME0_LENGTH] = { - 0xe4, 0xbf, 0x21, 0x62, 0x9b, 0xa9, 0x77, 0x40, - 0x8d, 0x2a, 0xce, 0xa1, 0x67, 0x5a, 0x4c, 0x96, - 0x45, 0x98, 0x67, 0xbd, 0x75, 0x22, 0x33, 0x6f, - 0xe6, 0xcb, 0x77, 0xde, 0x9e, 0x97, 0x7d, 0x96, - 0x8c, 0x5e, 0x5d, 0x34, 0xfb, 0x27, 0xfc, 0x6d, - 0x74, 0xdb, 0x9d, 0x2e, 0x6d, 0xf6, 0xea, 0xfc, - 0xce, 0x9e, 0xda, 0xa7, 0x25, 0xa2, 0xf4, 0x58, - 0x6d, 0x0a, 0x3f, 0x01, 0xc2, 0xb4, 0xab, 0x38, - 0xc1, 0x14, 0x85, 0xb6, 0xfa, 0x94, 0xc3, 0x85, - 0xf9, 0x3c, 0x2e, 0x96, 0x56, 0x01, 0xe7, 0xd6, - 0x14, 0x71, 0x4f, 0xfb, 0x4c, 0x85, 0x52, 0xc4, - 0x61, 0x1e, 0xa5, 0x1e, 0x96, 0x13, 0x0d, 0x8f, - 0x66, 0xae, 0xa0, 0xcd, 0x7d, 0x25, 0x66, 0x19, - 0x15, 0xc2, 0xcf, 0xc3, 0x12, 0x3c, 0xe8, 0xa4, - 0x52, 0x4c, 0xcb, 0x28, 0x3c, 0xc4, 0xbf, 0x95, - 0x33, 0xe3, 0x81, 0xea, 0x0c, 0x6c, 0xa2, 0x05}; - static const PRUint8 rsa_prime1[FIPS_RSA_PRIME1_LENGTH] = { - 0xce, 0x03, 0x94, 0xf4, 0xa9, 0x2c, 0x1e, 0x06, - 0xe7, 0x40, 0x30, 0x01, 0xf7, 0xbb, 0x68, 0x8c, - 0x27, 0xd2, 0x15, 0xe3, 0x28, 0x49, 0x5b, 0xa8, - 0xc1, 0x9a, 0x42, 0x7e, 0x31, 0xf9, 0x08, 0x34, - 0x81, 0xa2, 0x0f, 0x04, 0x61, 0x34, 0xe3, 0x36, - 0x92, 0xb1, 0x09, 0x2b, 0xe9, 0xef, 0x84, 0x88, - 0xbe, 0x9c, 0x98, 0x60, 0xa6, 0x60, 0x84, 0xe9, - 0x75, 0x6f, 0xcc, 0x81, 0xd1, 0x96, 0xef, 0xdd, - 0x2e, 0xca, 0xc4, 0xf5, 0x42, 0xfb, 0x13, 0x2b, - 0x57, 0xbf, 0x14, 0x5e, 0xc2, 0x7f, 0x77, 0x35, - 0x29, 0xc4, 0xe5, 0xe0, 0xf9, 0x6d, 0x15, 0x4a, - 0x42, 0x56, 0x1c, 0x3e, 0x0c, 0xc5, 0xce, 0x70, - 0x08, 0x63, 0x1e, 0x73, 0xdb, 0x7e, 0x74, 0x05, - 0x32, 0x01, 0xc6, 0x36, 0x32, 0x75, 0x6b, 0xed, - 0x9d, 0xfe, 0x7c, 0x7e, 0xa9, 0x57, 0xb4, 0xe9, - 0x22, 0xe4, 0xe7, 0xfe, 0x36, 0x07, 0x9b, 0xdf}; - static const PRUint8 rsa_exponent0[FIPS_RSA_EXPONENT0_LENGTH] = { - 0x04, 0x5a, 0x3a, 0xa9, 0x64, 0xaa, 0xd9, 0xd1, - 0x09, 0x9e, 0x99, 0xe5, 0xea, 0x50, 0x86, 0x8a, - 0x89, 0x72, 0x77, 0xee, 0xdb, 0xee, 0xb5, 0xa9, - 0xd8, 0x6b, 0x60, 0xb1, 0x84, 0xb4, 0xff, 0x37, - 0xc1, 0x1d, 0xfe, 0x8a, 0x06, 0x89, 0x61, 0x3d, - 0x37, 0xef, 0x01, 0xd3, 0xa3, 0x56, 0x02, 0x6c, - 0xa3, 0x05, 0xd4, 0xc5, 0x3f, 0x6b, 0x15, 0x59, - 0x25, 0x61, 0xff, 0x86, 0xea, 0x0c, 0x84, 0x01, - 0x85, 0x72, 0xfd, 0x84, 0x58, 0xca, 0x41, 0xda, - 0x27, 0xbe, 0xe4, 0x68, 0x09, 0xe4, 0xe9, 0x63, - 0x62, 0x6a, 0x31, 0x8a, 0x67, 0x8f, 0x55, 0xde, - 0xd4, 0xb6, 0x3f, 0x90, 0x10, 0x6c, 0xf6, 0x62, - 0x17, 0x23, 0x15, 0x7e, 0x33, 0x76, 0x65, 0xb5, - 0xee, 0x7b, 0x11, 0x76, 0xf5, 0xbe, 0xe0, 0xf2, - 0x57, 0x7a, 0x8c, 0x97, 0x0c, 0x68, 0xf5, 0xf8, - 0x41, 0xcf, 0x7f, 0x66, 0x53, 0xac, 0x31, 0x7d}; - static const PRUint8 rsa_exponent1[FIPS_RSA_EXPONENT1_LENGTH] = { - 0x93, 0x54, 0x14, 0x6e, 0x73, 0x9d, 0x4d, 0x4b, - 0xfa, 0x8c, 0xf8, 0xc8, 0x2f, 0x76, 0x22, 0xea, - 0x38, 0x80, 0x11, 0x8f, 0x05, 0xfc, 0x90, 0x44, - 0x3b, 0x50, 0x2a, 0x45, 0x3d, 0x4f, 0xaf, 0x02, - 0x7d, 0xc2, 0x7b, 0xa2, 0xd2, 0x31, 0x94, 0x5c, - 0x2e, 0xc3, 0xd4, 0x9f, 0x47, 0x09, 0x37, 0x6a, - 0xe3, 0x85, 0xf1, 0xa3, 0x0c, 0xd8, 0xf1, 0xb4, - 0x53, 0x7b, 0xc4, 0x71, 0x02, 0x86, 0x42, 0xbb, - 0x96, 0xff, 0x03, 0xa3, 0xb2, 0x67, 0x03, 0xea, - 0x77, 0x31, 0xfb, 0x4b, 0x59, 0x24, 0xf7, 0x07, - 0x59, 0xfb, 0xa9, 0xba, 0x1e, 0x26, 0x58, 0x97, - 0x66, 0xa1, 0x56, 0x49, 0x39, 0xb1, 0x2c, 0x55, - 0x0a, 0x6a, 0x78, 0x18, 0xba, 0xdb, 0xcf, 0xf4, - 0xf7, 0x32, 0x35, 0xa2, 0x04, 0xab, 0xdc, 0xa7, - 0x6d, 0xd9, 0xd5, 0x06, 0x6f, 0xec, 0x7d, 0x40, - 0x4c, 0xe8, 0x0e, 0xd0, 0xc9, 0xaa, 0xdf, 0x59}; - static const PRUint8 rsa_coefficient[FIPS_RSA_COEFFICIENT_LENGTH] = { - 0x17, 0xd7, 0xf5, 0x0a, 0xf0, 0x68, 0x97, 0x96, - 0xc4, 0x29, 0x18, 0x77, 0x9a, 0x1f, 0xe3, 0xf3, - 0x12, 0x13, 0x0f, 0x7e, 0x7b, 0xb9, 0xc1, 0x91, - 0xf9, 0xc7, 0x08, 0x56, 0x5c, 0xa4, 0xbc, 0x83, - 0x71, 0xf9, 0x78, 0xd9, 0x2b, 0xec, 0xfe, 0x6b, - 0xdc, 0x2f, 0x63, 0xc9, 0xcd, 0x50, 0x14, 0x5b, - 0xd3, 0x6e, 0x85, 0x4d, 0x0c, 0xa2, 0x0b, 0xa0, - 0x09, 0xb6, 0xca, 0x34, 0x9c, 0xc2, 0xc1, 0x4a, - 0xb0, 0xbc, 0x45, 0x93, 0xa5, 0x7e, 0x99, 0xb5, - 0xbd, 0xe4, 0x69, 0x29, 0x08, 0x28, 0xd2, 0xcd, - 0xab, 0x24, 0x78, 0x48, 0x41, 0x26, 0x0b, 0x37, - 0xa3, 0x43, 0xd1, 0x95, 0x1a, 0xd6, 0xee, 0x22, - 0x1c, 0x00, 0x0b, 0xc2, 0xb7, 0xa4, 0xa3, 0x21, - 0xa9, 0xcd, 0xe4, 0x69, 0xd3, 0x45, 0x02, 0xb1, - 0xb7, 0x3a, 0xbf, 0x51, 0x35, 0x1b, 0x78, 0xc2, - 0xcf, 0x0c, 0x0d, 0x60, 0x09, 0xa9, 0x44, 0x02}; - - /* RSA Known Plaintext Message (1024-bits). */ - static const PRUint8 rsa_known_plaintext_msg[FIPS_RSA_MESSAGE_LENGTH] = { - "Known plaintext message utilized" - "for RSA Encryption & Decryption" - "blocks SHA256, SHA384 and " - "SHA512 RSA Signature KAT tests. " - "Known plaintext message utilized" - "for RSA Encryption & Decryption" - "blocks SHA256, SHA384 and " - "SHA512 RSA Signature KAT tests."}; - - /* RSA Known Ciphertext (2048-bits). */ - static const PRUint8 rsa_known_ciphertext[] = { - 0x04, 0x12, 0x46, 0xe3, 0x6a, 0xee, 0xde, 0xdd, - 0x49, 0xa1, 0xd9, 0x83, 0xf7, 0x35, 0xf9, 0x70, - 0x88, 0x03, 0x2d, 0x01, 0x8b, 0xd1, 0xbf, 0xdb, - 0xe5, 0x1c, 0x85, 0xbe, 0xb5, 0x0b, 0x48, 0x45, - 0x7a, 0xf0, 0xa0, 0xe3, 0xa2, 0xbb, 0x4b, 0xf6, - 0x27, 0xd0, 0x1b, 0x12, 0xe3, 0x77, 0x52, 0x34, - 0x9e, 0x8e, 0x03, 0xd2, 0xf8, 0x79, 0x6e, 0x39, - 0x79, 0x53, 0x3c, 0x44, 0x14, 0x94, 0xbb, 0x8d, - 0xaa, 0x14, 0x44, 0xa0, 0x7b, 0xa5, 0x8c, 0x93, - 0x5f, 0x99, 0xa4, 0xa3, 0x6e, 0x7a, 0x38, 0x40, - 0x78, 0xfa, 0x36, 0x91, 0x5e, 0x9a, 0x9c, 0xba, - 0x1e, 0xd4, 0xf9, 0xda, 0x4b, 0x0f, 0xa8, 0xa3, - 0x1c, 0xf3, 0x3a, 0xd1, 0xa5, 0xb4, 0x51, 0x16, - 0xed, 0x4b, 0xcf, 0xec, 0x93, 0x7b, 0x90, 0x21, - 0xbc, 0x3a, 0xf4, 0x0b, 0xd1, 0x3a, 0x2b, 0xba, - 0xa6, 0x7d, 0x5b, 0x53, 0xd8, 0x64, 0xf9, 0x29, - 0x7b, 0x7f, 0x77, 0x3e, 0x51, 0x4c, 0x9a, 0x94, - 0xd2, 0x4b, 0x4a, 0x8d, 0x61, 0x74, 0x97, 0xae, - 0x53, 0x6a, 0xf4, 0x90, 0xc2, 0x2c, 0x49, 0xe2, - 0xfa, 0xeb, 0x91, 0xc5, 0xe5, 0x83, 0x13, 0xc9, - 0x44, 0x4b, 0x95, 0x2c, 0x57, 0x70, 0x15, 0x5c, - 0x64, 0x8d, 0x1a, 0xfd, 0x2a, 0xc7, 0xb2, 0x9c, - 0x5c, 0x99, 0xd3, 0x4a, 0xfd, 0xdd, 0xf6, 0x82, - 0x87, 0x8c, 0x5a, 0xc4, 0xa8, 0x0d, 0x2a, 0xef, - 0xc3, 0xa2, 0x7e, 0x8e, 0x67, 0x9f, 0x6f, 0x63, - 0xdb, 0xbb, 0x1d, 0x31, 0xc4, 0xbb, 0xbc, 0x13, - 0x3f, 0x54, 0xc6, 0xf6, 0xc5, 0x28, 0x32, 0xab, - 0x96, 0x42, 0x10, 0x36, 0x40, 0x92, 0xbb, 0x57, - 0x55, 0x38, 0xf5, 0x43, 0x7e, 0x43, 0xc4, 0x65, - 0x47, 0x64, 0xaa, 0x0f, 0x4c, 0xe9, 0x49, 0x16, - 0xec, 0x6a, 0x50, 0xfd, 0x14, 0x49, 0xca, 0xdb, - 0x44, 0x54, 0xca, 0xbe, 0xa3, 0x0e, 0x5f, 0xef}; - - - static const RSAPublicKey bl_public_key = { NULL, - { FIPS_RSA_TYPE, (unsigned char *)rsa_modulus, - FIPS_RSA_MODULUS_LENGTH }, - { FIPS_RSA_TYPE, (unsigned char *)rsa_public_exponent, - FIPS_RSA_PUBLIC_EXPONENT_LENGTH } - }; - static const RSAPrivateKey bl_private_key = { NULL, - { FIPS_RSA_TYPE, (unsigned char *)rsa_version, - FIPS_RSA_PRIVATE_VERSION_LENGTH }, - { FIPS_RSA_TYPE, (unsigned char *)rsa_modulus, - FIPS_RSA_MODULUS_LENGTH }, - { FIPS_RSA_TYPE, (unsigned char *)rsa_public_exponent, - FIPS_RSA_PUBLIC_EXPONENT_LENGTH }, - { FIPS_RSA_TYPE, (unsigned char *)rsa_private_exponent, - FIPS_RSA_PRIVATE_EXPONENT_LENGTH }, - { FIPS_RSA_TYPE, (unsigned char *)rsa_prime0, - FIPS_RSA_PRIME0_LENGTH }, - { FIPS_RSA_TYPE, (unsigned char *)rsa_prime1, - FIPS_RSA_PRIME1_LENGTH }, - { FIPS_RSA_TYPE, (unsigned char *)rsa_exponent0, - FIPS_RSA_EXPONENT0_LENGTH }, - { FIPS_RSA_TYPE, (unsigned char *)rsa_exponent1, - FIPS_RSA_EXPONENT1_LENGTH }, - { FIPS_RSA_TYPE, (unsigned char *)rsa_coefficient, - FIPS_RSA_COEFFICIENT_LENGTH } - }; - - /* RSA variables. */ - SECStatus rsa_status; - RSAPublicKey rsa_public_key; - RSAPrivateKey rsa_private_key; - - PRUint8 rsa_computed_ciphertext[FIPS_RSA_ENCRYPT_LENGTH]; - PRUint8 rsa_computed_plaintext[FIPS_RSA_DECRYPT_LENGTH]; - - rsa_public_key = bl_public_key; - rsa_private_key = bl_private_key; - - /**************************************************/ - /* RSA Single-Round Known Answer Encryption Test. */ - /**************************************************/ - - /* Perform RSA Public Key Encryption. */ - rsa_status = RSA_PublicKeyOp(&rsa_public_key, - rsa_computed_ciphertext, - rsa_known_plaintext_msg); - - if( ( rsa_status != SECSuccess ) || - ( PORT_Memcmp( rsa_computed_ciphertext, rsa_known_ciphertext, - FIPS_RSA_ENCRYPT_LENGTH ) != 0 ) ) - goto rsa_loser; - - /**************************************************/ - /* RSA Single-Round Known Answer Decryption Test. */ - /**************************************************/ - - /* Perform RSA Private Key Decryption. */ - rsa_status = RSA_PrivateKeyOp(&rsa_private_key, - rsa_computed_plaintext, - rsa_known_ciphertext); - - if( ( rsa_status != SECSuccess ) || - ( PORT_Memcmp( rsa_computed_plaintext, rsa_known_plaintext_msg, - FIPS_RSA_DECRYPT_LENGTH ) != 0 ) ) - goto rsa_loser; - - return( SECSuccess ); - -rsa_loser: - - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); -} - -#ifdef NSS_ENABLE_ECC - -static SECStatus -freebl_fips_ECDSA_Test(ECParams *ecparams, - const PRUint8 *knownSignature, - unsigned int knownSignatureLen) { - - /* ECDSA Known Seed info for curves nistp256 and nistk283 */ - static const PRUint8 ecdsa_Known_Seed[] = { - 0x6a, 0x9b, 0xf6, 0xf7, 0xce, 0xed, 0x79, 0x11, - 0xf0, 0xc7, 0xc8, 0x9a, 0xa5, 0xd1, 0x57, 0xb1, - 0x7b, 0x5a, 0x3b, 0x76, 0x4e, 0x7b, 0x7c, 0xbc, - 0xf2, 0x76, 0x1c, 0x1c, 0x7f, 0xc5, 0x53, 0x2f}; - - static const PRUint8 msg[] = { - "Firefox and ThunderBird are awesome!"}; - - unsigned char sha1[SHA1_LENGTH]; /* SHA-1 hash (160 bits) */ - unsigned char sig[2*MAX_ECKEY_LEN]; - SECItem signature, digest; - ECPrivateKey *ecdsa_private_key = NULL; - ECPublicKey ecdsa_public_key; - SECStatus ecdsaStatus = SECSuccess; - - /* Generates a new EC key pair. The private key is a supplied - * random value (in seed) and the public key is the result of - * performing a scalar point multiplication of that value with - * the curve's base point. - */ - ecdsaStatus = EC_NewKeyFromSeed(ecparams, &ecdsa_private_key, - ecdsa_Known_Seed, - sizeof(ecdsa_Known_Seed)); - if (ecdsaStatus != SECSuccess) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - - /* construct public key from private key. */ - ecdsa_public_key.ecParams = ecdsa_private_key->ecParams; - ecdsa_public_key.publicValue = ecdsa_private_key->publicValue; - - /* validate public key value */ - ecdsaStatus = EC_ValidatePublicKey(&ecdsa_public_key.ecParams, - &ecdsa_public_key.publicValue); - if (ecdsaStatus != SECSuccess) { - goto loser; - } - - /* validate public key value */ - ecdsaStatus = EC_ValidatePublicKey(&ecdsa_private_key->ecParams, - &ecdsa_private_key->publicValue); - if (ecdsaStatus != SECSuccess) { - goto loser; - } - - /***************************************************/ - /* ECDSA Single-Round Known Answer Signature Test. */ - /***************************************************/ - - ecdsaStatus = SHA1_HashBuf(sha1, msg, sizeof msg); - if (ecdsaStatus != SECSuccess) { - goto loser; - } - digest.type = siBuffer; - digest.data = sha1; - digest.len = SHA1_LENGTH; - - memset(sig, 0, sizeof sig); - signature.type = siBuffer; - signature.data = sig; - signature.len = sizeof sig; - - ecdsaStatus = ECDSA_SignDigestWithSeed(ecdsa_private_key, &signature, - &digest, ecdsa_Known_Seed, sizeof ecdsa_Known_Seed); - if (ecdsaStatus != SECSuccess) { - goto loser; - } - - if( ( signature.len != knownSignatureLen ) || - ( PORT_Memcmp( signature.data, knownSignature, - knownSignatureLen ) != 0 ) ) { - ecdsaStatus = SECFailure; - goto loser; - } - - /******************************************************/ - /* ECDSA Single-Round Known Answer Verification Test. */ - /******************************************************/ - - /* Perform ECDSA verification process. */ - ecdsaStatus = ECDSA_VerifyDigest(&ecdsa_public_key, &signature, &digest); - -loser: - /* free the memory for the private key arena*/ - if (ecdsa_private_key != NULL) { - PORT_FreeArena(ecdsa_private_key->ecParams.arena, PR_FALSE); - } - - if (ecdsaStatus != SECSuccess) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); - } - return( SECSuccess ); -} - -static SECStatus -freebl_fips_ECDSA_PowerUpSelfTest() { - - /* ECDSA Known curve nistp256 == ECCCurve_X9_62_PRIME_256V1 params */ - static const unsigned char p256_prime[] = { - 0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, - 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}; - static const unsigned char p256_a[] = { - 0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, - 0xFF,0xFF,0xFF,0xFF,0xFF,0xFC}; - static const unsigned char p256_b[] = { - 0x5A,0xC6,0x35,0xD8,0xAA,0x3A,0x93,0xE7,0xB3,0xEB,0xBD,0x55,0x76, - 0x98,0x86,0xBC,0x65,0x1D,0x06,0xB0,0xCC,0x53,0xB0,0xF6,0x3B,0xCE, - 0x3C,0x3E,0x27,0xD2,0x60,0x4B}; - static const unsigned char p256_base[] = { 0x04, - 0x6B,0x17,0xD1,0xF2,0xE1,0x2C,0x42,0x47,0xF8,0xBC,0xE6,0xE5,0x63, - 0xA4,0x40,0xF2,0x77,0x03,0x7D,0x81,0x2D,0xEB,0x33,0xA0,0xF4,0xA1, - 0x39,0x45,0xD8,0x98,0xC2,0x96, - 0x4F,0xE3,0x42,0xE2,0xFE,0x1A,0x7F,0x9B,0x8E,0xE7,0xEB,0x4A,0x7C, - 0x0F,0x9E,0x16,0x2B,0xCE,0x33,0x57,0x6B,0x31,0x5E,0xCE,0xCB,0xB6, - 0x40,0x68,0x37,0xBF,0x51,0xF5}; - static const unsigned char p256_order[] = { - 0xFF,0xFF,0xFF,0xFF,0x00,0x00,0x00,0x00,0xFF,0xFF,0xFF,0xFF,0xFF, - 0xFF,0xFF,0xFF,0xBC,0xE6,0xFA,0xAD,0xA7,0x17,0x9E,0x84,0xF3,0xB9, - 0xCA,0xC2,0xFC,0x63,0x25,0x51}; - static const unsigned char p256_encoding[] = { - 0x06,0x08,0x2a,0x86,0x48,0xce,0x3d,0x03, 0x01,0x07 }; - static const ECParams ecdsa_known_P256_Params = { - NULL, ec_params_named, /* arena, type */ - /* fieldID */ - { 256 , ec_field_GFp, /* size and type */ - {{siBuffer, p256_prime, sizeof(p256_prime)}}, /* u.prime */ - 0, 0, 0 }, - /* curve */ - { - /* a = curvea b = curveb */ - /* curve.a */ - { siBuffer, p256_a, sizeof(p256_a) }, - /* curve.b */ - { siBuffer, p256_b, sizeof(p256_b) }, - /* curve.seed */ - { siBuffer, NULL, 0} - }, - /* base = 04xy*/ - { siBuffer, p256_base, sizeof(p256_base) }, - /* order */ - { siBuffer, p256_order, sizeof(p256_order) }, - 1,/* cofactor */ - /* DEREncoding */ - { siBuffer, p256_encoding, sizeof(p256_encoding)}, - ECCurve_X9_62_PRIME_256V1, - /* curveOID */ - { siBuffer, p256_encoding+2, sizeof(p256_encoding)-2}, - }; - - - static const PRUint8 ecdsa_known_P256_signature[] = { - 0x07,0xb1,0xcb,0x57,0x20,0xa7,0x10,0xd6, - 0x9d,0x37,0x4b,0x1c,0xdc,0x35,0x90,0xff, - 0x1a,0x2d,0x98,0x95,0x1b,0x2f,0xeb,0x7f, - 0xbb,0x81,0xca,0xc0,0x69,0x75,0xea,0xc5, - 0x59,0x6a,0x62,0x49,0x3d,0x50,0xc9,0xe1, - 0x27,0x3b,0xff,0x9b,0x13,0x66,0x67,0xdd, - 0x7d,0xd1,0x0d,0x2d,0x7c,0x44,0x04,0x1b, - 0x16,0x21,0x12,0xc5,0xcb,0xbd,0x9e,0x75}; - -#ifdef NSS_ECC_MORE_THAN_SUITE_B - /* ECDSA Known curve nistk283 == SEC_OID_SECG_EC_SECT283K1 params */ - static const unsigned char k283_poly[] = { - 0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0xA1}; - static const unsigned char k283_a[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; - static const unsigned char k283_b[] = { - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, - 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01}; - static const unsigned char k283_base[] = { 0x04, - 0x05,0x03,0x21,0x3F,0x78,0xCA,0x44,0x88,0x3F,0x1A,0x3B,0x81,0x62, - 0xF1,0x88,0xE5,0x53,0xCD,0x26,0x5F,0x23,0xC1,0x56,0x7A,0x16,0x87, - 0x69,0x13,0xB0,0xC2,0xAC,0x24,0x58,0x49,0x28,0x36, - 0x01,0xCC,0xDA,0x38,0x0F,0x1C,0x9E,0x31,0x8D,0x90,0xF9,0x5D,0x07, - 0xE5,0x42,0x6F,0xE8,0x7E,0x45,0xC0,0xE8,0x18,0x46,0x98,0xE4,0x59, - 0x62,0x36,0x4E,0x34,0x11,0x61,0x77,0xDD,0x22,0x59}; - static const unsigned char k283_order[] = { - 0x01,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, - 0xFF,0xFF,0xFF,0xFF,0xFF,0xE9,0xAE,0x2E,0xD0,0x75,0x77,0x26,0x5D, - 0xFF,0x7F,0x94,0x45,0x1E,0x06,0x1E,0x16,0x3C,0x61}; - static const PRUint8 k283_encoding[] = { - 0x06,0x05,0x2b,0x81,0x04,0x00,0x10}; - - static const ECParams ecdsa_known_K283_Params = { - NULL, ec_params_named, /* arena, type */ - /* fieldID */ - { 283 , ec_field_GF2m, /* size and type */ - {{siBuffer, p283_poly, sizeof(p283_poly)}}, /* u.poly */ - 0, 0, 0 }, - /* curve */ - { - /* a = curvea b = curveb */ - /* curve.a */ - { siBuffer, p283_a, sizeof(p283_a) }, - /* curve.b */ - { siBuffer, p283_b, sizeof(p283_b) }, - /* curve.seed */ - { siBuffer, NULL, 0} - }, - /* base = 04xy*/ - { siBuffer, p283_base, sizeof(p283_base) }, - /* order */ - { siBuffer, p283_order, sizeof(p283_order) }, - 4,/* cofactor */ - /* DEREncoding */ - { siBuffer, k283_encoding, sizeof(k283_encoding)}, - /* name */ - ECCurve_SECG_CHAR2_283K1, - /* curveOID */ - { siBuffer, k283_encoding+2, sizeof(k283_encoding)-2}, - }; - - static const PRUint8 ecdsa_known_K283_signature[] = { - 0x00,0x45,0x88,0xc0,0x79,0x09,0x07,0xd1, - 0x4e,0x88,0xe6,0xd5,0x2f,0x22,0x04,0x74, - 0x35,0x24,0x65,0xe8,0x15,0xde,0x90,0x66, - 0x94,0x70,0xdd,0x3a,0x14,0x70,0x02,0xd1, - 0xef,0x86,0xbd,0x15,0x00,0xd9,0xdc,0xfc, - 0x87,0x2e,0x7c,0x99,0xe2,0xe3,0x79,0xb8, - 0xd9,0x10,0x49,0x78,0x4b,0x59,0x8b,0x05, - 0x77,0xec,0x6c,0xe8,0x35,0xe6,0x2e,0xa9, - 0xf9,0x77,0x1f,0x71,0x86,0xa5,0x4a,0xd0}; -#endif - ECParams ecparams; - - SECStatus rv; - - /* ECDSA GF(p) prime field curve test */ - ecparams = ecdsa_known_P256_Params; - rv = freebl_fips_ECDSA_Test(&ecparams, - ecdsa_known_P256_signature, - sizeof ecdsa_known_P256_signature ); - if (rv != SECSuccess) { - return( SECFailure ); - } - -#ifdef NSS_ECC_MORE_THAN_SUITE_B - /* ECDSA GF(2m) binary field curve test */ - ecparams = ecdsa_known_K283_Params; - rv = freebl_fips_ECDSA_Test(&ecparams, - ecdsa_known_K283_signature, - sizeof ecdsa_known_K283_signature ); - if (rv != SECSuccess) { - return( SECFailure ); - } -#endif - - return( SECSuccess ); -} - -#endif /* NSS_ENABLE_ECC */ - -static SECStatus -freebl_fips_DSA_PowerUpSelfTest( void ) -{ - /* DSA Known P (1024-bits), Q (160-bits), and G (1024-bits) Values. */ - static const PRUint8 dsa_P[] = { - 0x80,0xb0,0xd1,0x9d,0x6e,0xa4,0xf3,0x28, - 0x9f,0x24,0xa9,0x8a,0x49,0xd0,0x0c,0x63, - 0xe8,0x59,0x04,0xf9,0x89,0x4a,0x5e,0xc0, - 0x6d,0xd2,0x67,0x6b,0x37,0x81,0x83,0x0c, - 0xfe,0x3a,0x8a,0xfd,0xa0,0x3b,0x08,0x91, - 0x1c,0xcb,0xb5,0x63,0xb0,0x1c,0x70,0xd0, - 0xae,0xe1,0x60,0x2e,0x12,0xeb,0x54,0xc7, - 0xcf,0xc6,0xcc,0xae,0x97,0x52,0x32,0x63, - 0xd3,0xeb,0x55,0xea,0x2f,0x4c,0xd5,0xd7, - 0x3f,0xda,0xec,0x49,0x27,0x0b,0x14,0x56, - 0xc5,0x09,0xbe,0x4d,0x09,0x15,0x75,0x2b, - 0xa3,0x42,0x0d,0x03,0x71,0xdf,0x0f,0xf4, - 0x0e,0xe9,0x0c,0x46,0x93,0x3d,0x3f,0xa6, - 0x6c,0xdb,0xca,0xe5,0xac,0x96,0xc8,0x64, - 0x5c,0xec,0x4b,0x35,0x65,0xfc,0xfb,0x5a, - 0x1b,0x04,0x1b,0xa1,0x0e,0xfd,0x88,0x15}; - - static const PRUint8 dsa_Q[] = { - 0xad,0x22,0x59,0xdf,0xe5,0xec,0x4c,0x6e, - 0xf9,0x43,0xf0,0x4b,0x2d,0x50,0x51,0xc6, - 0x91,0x99,0x8b,0xcf}; - - static const PRUint8 dsa_G[] = { - 0x78,0x6e,0xa9,0xd8,0xcd,0x4a,0x85,0xa4, - 0x45,0xb6,0x6e,0x5d,0x21,0x50,0x61,0xf6, - 0x5f,0xdf,0x5c,0x7a,0xde,0x0d,0x19,0xd3, - 0xc1,0x3b,0x14,0xcc,0x8e,0xed,0xdb,0x17, - 0xb6,0xca,0xba,0x86,0xa9,0xea,0x51,0x2d, - 0xc1,0xa9,0x16,0xda,0xf8,0x7b,0x59,0x8a, - 0xdf,0xcb,0xa4,0x67,0x00,0x44,0xea,0x24, - 0x73,0xe5,0xcb,0x4b,0xaf,0x2a,0x31,0x25, - 0x22,0x28,0x3f,0x16,0x10,0x82,0xf7,0xeb, - 0x94,0x0d,0xdd,0x09,0x22,0x14,0x08,0x79, - 0xba,0x11,0x0b,0xf1,0xff,0x2d,0x67,0xac, - 0xeb,0xb6,0x55,0x51,0x69,0x97,0xa7,0x25, - 0x6b,0x9c,0xa0,0x9b,0xd5,0x08,0x9b,0x27, - 0x42,0x1c,0x7a,0x69,0x57,0xe6,0x2e,0xed, - 0xa9,0x5b,0x25,0xe8,0x1f,0xd2,0xed,0x1f, - 0xdf,0xe7,0x80,0x17,0xba,0x0d,0x4d,0x38}; - - /* DSA Known Random Values (known random key block is 160-bits) */ - /* and (known random signature block is 160-bits). */ - static const PRUint8 dsa_known_random_key_block[] = { - "Mozilla Rules World!"}; - static const PRUint8 dsa_known_random_signature_block[] = { - "Random DSA Signature"}; - - /* DSA Known Digest (160-bits) */ - static const PRUint8 dsa_known_digest[] = { "DSA Signature Digest" }; - - /* DSA Known Signature (320-bits). */ - static const PRUint8 dsa_known_signature[] = { - 0x25,0x7c,0x3a,0x79,0x32,0x45,0xb7,0x32, - 0x70,0xca,0x62,0x63,0x2b,0xf6,0x29,0x2c, - 0x22,0x2a,0x03,0xce,0x48,0x15,0x11,0x72, - 0x7b,0x7e,0xf5,0x7a,0xf3,0x10,0x3b,0xde, - 0x34,0xc1,0x9e,0xd7,0x27,0x9e,0x77,0x38}; - - /* DSA variables. */ - DSAPrivateKey * dsa_private_key; - SECStatus dsa_status; - SECItem dsa_signature_item; - SECItem dsa_digest_item; - DSAPublicKey dsa_public_key; - PRUint8 dsa_computed_signature[FIPS_DSA_SIGNATURE_LENGTH]; - static const PQGParams dsa_pqg = { NULL, - { FIPS_DSA_TYPE, (unsigned char *)dsa_P, FIPS_DSA_PRIME_LENGTH }, - { FIPS_DSA_TYPE, (unsigned char *)dsa_Q, FIPS_DSA_SUBPRIME_LENGTH }, - { FIPS_DSA_TYPE, (unsigned char *)dsa_G, FIPS_DSA_BASE_LENGTH }}; - - /*******************************************/ - /* Generate a DSA public/private key pair. */ - /*******************************************/ - - /* Generate a DSA public/private key pair. */ - dsa_status = DSA_NewKeyFromSeed(&dsa_pqg, dsa_known_random_key_block, - &dsa_private_key); - - if( dsa_status != SECSuccess ) { - PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); - } - - /* construct public key from private key. */ - dsa_public_key.params = dsa_private_key->params; - dsa_public_key.publicValue = dsa_private_key->publicValue; - - /*************************************************/ - /* DSA Single-Round Known Answer Signature Test. */ - /*************************************************/ - - dsa_signature_item.data = dsa_computed_signature; - dsa_signature_item.len = sizeof dsa_computed_signature; - - dsa_digest_item.data = (unsigned char *)dsa_known_digest; - dsa_digest_item.len = SHA1_LENGTH; - - /* Perform DSA signature process. */ - dsa_status = DSA_SignDigestWithSeed( dsa_private_key, - &dsa_signature_item, - &dsa_digest_item, - dsa_known_random_signature_block ); - - if( ( dsa_status != SECSuccess ) || - ( dsa_signature_item.len != FIPS_DSA_SIGNATURE_LENGTH ) || - ( PORT_Memcmp( dsa_computed_signature, dsa_known_signature, - FIPS_DSA_SIGNATURE_LENGTH ) != 0 ) ) { - dsa_status = SECFailure; - } else { - - /****************************************************/ - /* DSA Single-Round Known Answer Verification Test. */ - /****************************************************/ - - /* Perform DSA verification process. */ - dsa_status = DSA_VerifyDigest( &dsa_public_key, - &dsa_signature_item, - &dsa_digest_item); - } - - PORT_FreeArena(dsa_private_key->params.arena, PR_TRUE); - /* Don't free public key, it uses same arena as private key */ - - /* Verify DSA signature. */ - if( dsa_status != SECSuccess ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return SECFailure; - } - - return( SECSuccess ); - - -} - -static SECStatus -freebl_fips_RNG_PowerUpSelfTest( void ) -{ - static const PRUint8 Q[] = { - 0x85,0x89,0x9c,0x77,0xa3,0x79,0xff,0x1a, - 0x86,0x6f,0x2f,0x3e,0x2e,0xf9,0x8c,0x9c, - 0x9d,0xef,0xeb,0xed}; - static const PRUint8 GENX[] = { - 0x65,0x48,0xe3,0xca,0xac,0x64,0x2d,0xf7, - 0x7b,0xd3,0x4e,0x79,0xc9,0x7d,0xa6,0xa8, - 0xa2,0xc2,0x1f,0x8f,0xe9,0xb9,0xd3,0xa1, - 0x3f,0xf7,0x0c,0xcd,0xa6,0xca,0xbf,0xce, - 0x84,0x0e,0xb6,0xf1,0x0d,0xbe,0xa9,0xa3}; - static const PRUint8 rng_known_DSAX[] = { - 0x7a,0x86,0xf1,0x7f,0xbd,0x4e,0x6e,0xd9, - 0x0a,0x26,0x21,0xd0,0x19,0xcb,0x86,0x73, - 0x10,0x1f,0x60,0xd7}; - - - - SECStatus rng_status = SECSuccess; - PRUint8 DSAX[FIPS_DSA_SUBPRIME_LENGTH]; - - /*******************************************/ - /* Run the SP 800-90 Health tests */ - /*******************************************/ - rng_status = PRNGTEST_RunHealthTests(); - if (rng_status != SECSuccess) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return SECFailure; - } - - /*******************************************/ - /* Generate DSAX fow given Q. */ - /*******************************************/ - - rng_status = FIPS186Change_ReduceModQForDSA(GENX, Q, DSAX); - - /* Verify DSAX to perform the RNG integrity check */ - if( ( rng_status != SECSuccess ) || - ( PORT_Memcmp( DSAX, rng_known_DSAX, - (FIPS_DSA_SUBPRIME_LENGTH) ) != 0 ) ) { - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return SECFailure; - } - - return( SECSuccess ); -} - -static SECStatus -freebl_fipsSoftwareIntegrityTest(const char *libname) -{ - SECStatus rv = SECSuccess; - - /* make sure that our check file signatures are OK */ - if( !BLAPI_VerifySelf(libname) ) { - rv = SECFailure; - } - return rv; -} - -#define DO_FREEBL 1 -#define DO_REST 2 - -static SECStatus -freebl_fipsPowerUpSelfTest( unsigned int tests ) -{ - SECStatus rv; - - /* - * stand alone freebl. Test hash, and rng - */ - if (tests & DO_FREEBL) { - - /* SHA-X Power-Up SelfTest(s). */ - rv = freebl_fips_SHA_PowerUpSelfTest(); - - if( rv != SECSuccess ) - return rv; - - /* RNG Power-Up SelfTest(s). */ - rv = freebl_fips_RNG_PowerUpSelfTest(); - - if( rv != SECSuccess ) - return rv; - } - - /* - * test the rest of the algorithms not accessed through freebl - * standalone */ - if (tests & DO_REST) { - - /* DES3 Power-Up SelfTest(s). */ - rv = freebl_fips_DES3_PowerUpSelfTest(); - - if( rv != SECSuccess ) - return rv; - - /* AES Power-Up SelfTest(s) for 128-bit key. */ - rv = freebl_fips_AES_PowerUpSelfTest(FIPS_AES_128_KEY_SIZE); - - if( rv != SECSuccess ) - return rv; - - /* AES Power-Up SelfTest(s) for 192-bit key. */ - rv = freebl_fips_AES_PowerUpSelfTest(FIPS_AES_192_KEY_SIZE); - - if( rv != SECSuccess ) - return rv; - - /* AES Power-Up SelfTest(s) for 256-bit key. */ - rv = freebl_fips_AES_PowerUpSelfTest(FIPS_AES_256_KEY_SIZE); - - if( rv != SECSuccess ) - return rv; - - /* HMAC SHA-X Power-Up SelfTest(s). */ - rv = freebl_fips_HMAC_PowerUpSelfTest(); - - if( rv != SECSuccess ) - return rv; - - /* NOTE: RSA can only be tested in full freebl. It requires access to - * the locking primitives */ - /* RSA Power-Up SelfTest(s). */ - rv = freebl_fips_RSA_PowerUpSelfTest(); - - if( rv != SECSuccess ) - return rv; - - /* DSA Power-Up SelfTest(s). */ - rv = freebl_fips_DSA_PowerUpSelfTest(); - - if( rv != SECSuccess ) - return rv; - -#ifdef NSS_ENABLE_ECC - /* ECDSA Power-Up SelfTest(s). */ - rv = freebl_fips_ECDSA_PowerUpSelfTest(); - - if( rv != SECSuccess ) - return rv; -#endif - } - /* Passed Power-Up SelfTest(s). */ - return( SECSuccess ); -} - -/* - * state variables. NOTE: freebl has two uses: a standalone use which - * provided limitted access to the hash functions throught the NSSLOWHASH_ - * interface and an joint use from softoken, using the function pointer - * table. The standalone use can operation without nspr or nss-util, while - * the joint use requires both to be loaded. Certain functions (like RSA) - * needs locking from NSPR, for instance. - * - * At load time, we need to handle the two uses separately. If nspr and - * nss-util are loaded, then we can run all the selftests, but if nspr and - * nss-util are not loaded, then we can't run all the selftests, and we need - * to prevent the softoken function pointer table from operating until the - * libraries are loaded and we try to use them. - */ -static PRBool self_tests_freebl_ran = PR_FALSE; -static PRBool self_tests_ran = PR_FALSE; -static PRBool self_tests_freebl_success = PR_FALSE; -static PRBool self_tests_success = PR_FALSE; -static PRBool fips_mode_available = PR_FALSE; - -/* - * accessors for freebl - */ -PRBool BL_POSTRan(PRBool freebl_only) -{ - SECStatus rv; - /* if the freebl self tests didn't run, there is something wrong with - * our on load tests */ - if (!self_tests_freebl_ran) { - return PR_FALSE; - } - /* if all the self tests have run, we are good */ - if (self_tests_ran) { - return PR_TRUE; - } - /* if we only care about the freebl tests, we are good */ - if (freebl_only) { - return PR_TRUE; - } - /* run the rest of the self tests */ - /* We could get there if freebl was loaded without the rest of the support - * libraries, but now we want to use more than just a standalone freebl. - * This requires the other libraries to be loaded. - * If they are now loaded, Try to run the rest of the selftests, - * otherwise fail (disabling access to these algorithms) */ - self_tests_ran = PR_TRUE; - BL_Init(); /* required by RSA */ - RNG_RNGInit(); /* required by RSA */ - rv = freebl_fipsPowerUpSelfTest(DO_REST); - if (rv == SECSuccess) { - self_tests_success = PR_TRUE; - } - return PR_TRUE; -} - -#include "blname.c" - -/* - * This function is called at dll load time, the code tha makes this - * happen is platform specific on defined above. - */ -static void -bl_startup_tests(void) -{ - const char *libraryName; - PRBool freebl_only = PR_FALSE; - SECStatus rv; - - PORT_Assert(self_tests_freebl_ran == PR_FALSE); - PORT_Assert(self_tests_success == PR_FALSE); - PORT_Assert(fips_mode_available == PR_FALSE); - self_tests_freebl_ran = PR_TRUE; /* we are running the tests */ - self_tests_success = PR_FALSE; /* force it just in case */ - self_tests_freebl_success = PR_FALSE; /* force it just in case */ - -#ifdef FREEBL_NO_DEPEND - rv = FREEBL_InitStubs(); - if (rv != SECSuccess) { - freebl_only = PR_TRUE; - } -#endif - - - self_tests_freebl_ran = PR_TRUE; /* we are running the tests */ - - if (!freebl_only) { - self_tests_ran = PR_TRUE; /* we're running all the tests */ - BL_Init(); /* needs to be called before RSA can be used */ - RNG_RNGInit(); - } - - /* always run the post tests */ - rv = freebl_fipsPowerUpSelfTest(freebl_only? DO_FREEBL : DO_FREEBL|DO_REST); - if (rv != SECSuccess) { - return; - } - - libraryName = getLibName(); - rv = freebl_fipsSoftwareIntegrityTest(libraryName); - if (rv != SECSuccess) { - return; - } - - /* posts are happy, allow the fips module to function now */ - self_tests_freebl_success = PR_TRUE; /* we always test the freebl stuff */ - if (!freebl_only) { - self_tests_success = PR_TRUE; - } -} - -/* - * this is called from the freebl init entry points that controll access to - * all other freebl functions. This prevents freebl from operating if our - * power on selftest failed. - */ -SECStatus -BL_FIPSEntryOK(PRBool freebl_only) { -#ifdef NSS_NO_INIT_SUPPORT - /* this should only be set on platforms that can't handle one of the INIT - * schemes. This code allows those platforms to continue to function, - * though they don't meet the strict NIST requirements. If NSS_NO_INIT_SUPPORT - * is not set, and init support has not been properly enabled, freebl - * will always fail because of the test below - */ - if (!self_tests_freebl_ran) { - bl_startup_tests(); - } -#endif - /* if the general self tests succeeded, we're done */ - if (self_tests_success) { - return SECSuccess; - } - /* standalone freebl can initialize */ - if (freebl_only & self_tests_freebl_success) { - return SECSuccess; - } - PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); - return SECFailure; -} - diff --git a/lib/freebl/freebl_hash_vector.def b/lib/freebl/freebl_hash_vector.def deleted file mode 100644 index 9d7d07d54..000000000 --- a/lib/freebl/freebl_hash_vector.def +++ /dev/null @@ -1,34 +0,0 @@ -;+# -;+# This Source Code Form is subject to the terms of the Mozilla Public -;+# License, v. 2.0. If a copy of the MPL was not distributed with this -;+# file, You can obtain one at http://mozilla.org/MPL/2.0/. -;+# -;+# OK, this file is meant to support SUN, LINUX, AIX and WINDOWS -;+# 1. For all unix platforms, the string ";-" means "remove this line" -;+# 2. For all unix platforms, the string " DATA " will be removed from any -;+# line on which it occurs. -;+# 3. Lines containing ";+" will have ";+" removed on SUN and LINUX. -;+# On AIX, lines containing ";+" will be removed. -;+# 4. For all unix platforms, the string ";;" will thave the ";;" removed. -;+# 5. For all unix platforms, after the above processing has taken place, -;+# all characters after the first ";" on the line will be removed. -;+# And for AIX, the first ";" will also be removed. -;+# This file is passed directly to windows. Since ';' is a comment, all UNIX -;+# directives are hidden behind ";", ";+", and ";-" -;+ -;+NSSprivate_3.11 { # NSS 3.11 release -;+ global: -LIBRARY freebl3 ;- -EXPORTS ;- -FREEBL_GetVector; -;+ local: -;+ *; -;+}; -;+NSSprivate_3.16 { # NSS 3.11 release -;+ global: -LIBRARY freebl3 ;- -EXPORTS ;- -NSSLOW_GetVector; -;+ local: -;+ *; -;+}; diff --git a/lib/freebl/gcm.c b/lib/freebl/gcm.c index da97245a3..c8ba7383a 100644 --- a/lib/freebl/gcm.c +++ b/lib/freebl/gcm.c @@ -192,7 +192,9 @@ gcmHash_DestroyContext(gcmHashContext *ghash, PRBool freeit) mp_clear(&ghash->H); mp_clear(&ghash->X); mp_clear(&ghash->C_i); - PORT_Memset(ghash, 0, sizeof(gcmHashContext)); + MP_DIGITS(&ghash->H) = 0; + MP_DIGITS(&ghash->X) = 0; + MP_DIGITS(&ghash->C_i) = 0; if (freeit) { PORT_Free(ghash); } @@ -265,7 +267,6 @@ gcm_HashMult(gcmHashContext *ghash, const unsigned char *buf, } rv = SECSuccess; cleanup: - PORT_Memset(tmp_buf, 0, sizeof(tmp_buf)); if (rv != SECSuccess) { MP_TO_SEC_ERROR(err); } @@ -365,7 +366,6 @@ cleanup: static void gcmHash_DestroyContext(gcmHashContext *ghash, PRBool freeit) { - PORT_Memset(ghash, 0, sizeof(gcmHashContext)); if (freeit) { PORT_Free(ghash); } @@ -423,7 +423,6 @@ gcm_HashMult(gcmHashContext *ghash, const unsigned char *buf, } GCM_TRACE_X(ghash, "X%d = ") } - PORT_Memset(C_i, 0, sizeof(C_i)); return SECSuccess; } @@ -539,30 +538,26 @@ gcmHash_Final(gcmHashContext *ghash, unsigned char *outbuf, rv = gcmHash_Sync(ghash, blocksize); if (rv != SECSuccess) { - goto cleanup; + return SECFailure; } rv = gcm_HashMult(ghash, ghash->counterBuf, (GCM_HASH_LEN_LEN*2)/blocksize, blocksize); if (rv != SECSuccess) { - goto cleanup; + return SECFailure; } GCM_TRACE_X(ghash, "GHASH(H,A,C) = ") rv = gcm_getX(ghash, T, blocksize); if (rv != SECSuccess) { - goto cleanup; + return SECFailure; } if (maxout > blocksize) maxout = blocksize; PORT_Memcpy(outbuf, T, maxout); *outlen = maxout; - rv = SECSuccess; - -cleanup: - PORT_Memset(T, 0, sizeof(T)); - return rv; + return SECSuccess; } SECStatus @@ -700,8 +695,6 @@ GCM_DestroyContext(GCMContext *gcm, PRBool freeit) * allocated data (like mp_int's) */ CTR_DestroyContext(&gcm->ctr_context, PR_FALSE); gcmHash_DestroyContext(&gcm->ghash_context, PR_FALSE); - PORT_Memset(&gcm->tagBits, 0, sizeof(gcm->tagBits)); - PORT_Memset(gcm->tagKey, 0, sizeof(gcm->tagKey)); if (freeit) { PORT_Free(gcm); } @@ -845,10 +838,8 @@ GCM_DecryptUpdate(GCMContext *gcm, unsigned char *outbuf, if (NSS_SecureMemcmp(tag, intag, tagBytes) != 0) { /* force a CKR_ENCRYPTED_DATA_INVALID error at in softoken */ PORT_SetError(SEC_ERROR_BAD_DATA); - PORT_Memset(tag, 0, sizeof(tag)); return SECFailure; } - PORT_Memset(tag, 0, sizeof(tag)); /* finish the decryption */ return CTR_Update(&gcm->ctr_context, outbuf, outlen, maxout, inbuf, inlen, blocksize); diff --git a/lib/freebl/ldvector.c b/lib/freebl/ldvector.c index d598fd6d9..1d9affec2 100644 --- a/lib/freebl/ldvector.c +++ b/lib/freebl/ldvector.c @@ -12,7 +12,7 @@ extern int FREEBL_InitStubs(void); #include "loader.h" #include "alghmac.h" #include "hmacct.h" -#include "blapii.h" + static const struct FREEBLVectorStr vector = { @@ -291,54 +291,15 @@ static const struct FREEBLVectorStr vector = /* End of Version 3.017 */ }; - - const FREEBLVector * FREEBL_GetVector(void) { -#ifdef FREEBL_NO_DEPEND - SECStatus rv; -#endif - #define NSS_VERSION_VARIABLE __nss_freebl_version #include "verref.h" #ifdef FREEBL_NO_DEPEND - /* this entry point is only valid if nspr and nss-util has been loaded */ - rv = FREEBL_InitStubs(); - if (rv != SECSuccess) { - return NULL; - } + FREEBL_InitStubs(); #endif - /* make sure the Full self tests have been run before continuing */ - BL_POSTRan(PR_FALSE); - return &vector; } -#ifdef FREEBL_LOWHASH -static const struct NSSLOWVectorStr nssvector = -{ - sizeof nssvector, - NSSLOW_VERSION, - FREEBL_GetVector, - NSSLOW_Init, - NSSLOW_Shutdown, - NSSLOW_Reset, - NSSLOWHASH_NewContext, - NSSLOWHASH_Begin, - NSSLOWHASH_Update, - NSSLOWHASH_End, - NSSLOWHASH_Destroy, - NSSLOWHASH_Length -}; - -const NSSLOWVector * -NSSLOW_GetVector(void) -{ - /* POST check and stub init happens in FREEBL_GetVector() and - * NSSLOW_Init() respectively */ - return &nssvector; -} -#endif - diff --git a/lib/freebl/loader.c b/lib/freebl/loader.c index 8912380f9..9105a6900 100644 --- a/lib/freebl/loader.c +++ b/lib/freebl/loader.c @@ -10,7 +10,93 @@ #include "prerror.h" #include "prinit.h" #include "prenv.h" -#include "blname.c" + +static const char* default_name = + SHLIB_PREFIX"freebl"SHLIB_VERSION"."SHLIB_SUFFIX; + +/* getLibName() returns the name of the library to load. */ + +#if defined(SOLARIS) && defined(__sparc) +#include <stddef.h> +#include <strings.h> +#include <sys/systeminfo.h> + + +#if defined(NSS_USE_64) + +const static char fpu_hybrid_shared_lib[] = "libfreebl_64fpu_3.so"; +const static char int_hybrid_shared_lib[] = "libfreebl_64int_3.so"; +const static char non_hybrid_shared_lib[] = "libfreebl_64fpu_3.so"; + +const static char int_hybrid_isa[] = "sparcv9"; +const static char fpu_hybrid_isa[] = "sparcv9+vis"; + +#else + +const static char fpu_hybrid_shared_lib[] = "libfreebl_32fpu_3.so"; +const static char int_hybrid_shared_lib[] = "libfreebl_32int64_3.so"; +/* This was for SPARC V8, now obsolete. */ +const static char *const non_hybrid_shared_lib = NULL; + +const static char int_hybrid_isa[] = "sparcv8plus"; +const static char fpu_hybrid_isa[] = "sparcv8plus+vis"; + +#endif + +static const char * +getLibName(void) +{ + char * found_int_hybrid; + char * found_fpu_hybrid; + long buflen; + char buf[256]; + + buflen = sysinfo(SI_ISALIST, buf, sizeof buf); + if (buflen <= 0) + return NULL; + /* sysinfo output is always supposed to be NUL terminated, but ... */ + if (buflen < sizeof buf) + buf[buflen] = '\0'; + else + buf[(sizeof buf) - 1] = '\0'; + /* The ISA list is a space separated string of names of ISAs and + * ISA extensions, in order of decreasing performance. + * There are two different ISAs with which NSS's crypto code can be + * accelerated. If both are in the list, we take the first one. + * If one is in the list, we use it, and if neither then we use + * the base unaccelerated code. + */ + found_int_hybrid = strstr(buf, int_hybrid_isa); + found_fpu_hybrid = strstr(buf, fpu_hybrid_isa); + if (found_fpu_hybrid && + (!found_int_hybrid || + (found_int_hybrid - found_fpu_hybrid) >= 0)) { + return fpu_hybrid_shared_lib; + } + if (found_int_hybrid) { + return int_hybrid_shared_lib; + } + return non_hybrid_shared_lib; +} + +#elif defined(HPUX) && !defined(NSS_USE_64) && !defined(__ia64) +#include <unistd.h> + +/* This code tests to see if we're running on a PA2.x CPU. +** It returns true (1) if so, and false (0) otherwise. +*/ +static const char * +getLibName(void) +{ + long cpu = sysconf(_SC_CPU_VERSION); + return (cpu == CPU_PA_RISC2_0) + ? "libfreebl_32fpu_3.sl" + : "libfreebl_32int_3.sl" ; +} +#else +/* default case, for platforms/ABIs that have only one freebl shared lib. */ +static const char * getLibName(void) { return default_name; } +#endif #include "prio.h" #include "prprf.h" @@ -20,7 +106,7 @@ static const char *NameOfThisSharedLib = SHLIB_PREFIX"softokn"SOFTOKEN_SHLIB_VERSION"."SHLIB_SUFFIX; -static PRLibrary* blLib = NULL; +static PRLibrary* blLib; #define LSB(x) ((x)&0xff) #define MSB(x) ((x)>>8) @@ -63,12 +149,12 @@ freebl_LoadDSO( void ) } } #ifdef DEBUG - if (blLib) { + { PRStatus status = PR_UnloadLibrary(blLib); PORT_Assert(PR_SUCCESS == status); } #else - if (blLib) PR_UnloadLibrary(blLib); + PR_UnloadLibrary(blLib); #endif } return PR_FAILURE; diff --git a/lib/freebl/loader.h b/lib/freebl/loader.h index 7bd374141..65cfd76de 100644 --- a/lib/freebl/loader.h +++ b/lib/freebl/loader.h @@ -10,7 +10,6 @@ #include "blapi.h" - #define FREEBL_VERSION 0x0311 struct FREEBLVectorStr { @@ -714,43 +713,8 @@ struct FREEBLVectorStr { typedef struct FREEBLVectorStr FREEBLVector; -#ifdef FREEBL_LOWHASH -#include "nsslowhash.h" - -#define NSSLOW_VERSION 0x0300 - -struct NSSLOWVectorStr { - unsigned short length; /* of this struct in bytes */ - unsigned short version; /* of this struct. */ - const FREEBLVector *(*p_FREEBL_GetVector)(void); - NSSLOWInitContext *(*p_NSSLOW_Init)(void); - void (*p_NSSLOW_Shutdown)(NSSLOWInitContext *context); - void (*p_NSSLOW_Reset)(NSSLOWInitContext *context); - NSSLOWHASHContext *(*p_NSSLOWHASH_NewContext)( - NSSLOWInitContext *initContext, - HASH_HashType hashType); - void (*p_NSSLOWHASH_Begin)(NSSLOWHASHContext *context); - void (*p_NSSLOWHASH_Update)(NSSLOWHASHContext *context, - const unsigned char *buf, - unsigned int len); - void (*p_NSSLOWHASH_End)(NSSLOWHASHContext *context, - unsigned char *buf, - unsigned int *ret, unsigned int len); - void (*p_NSSLOWHASH_Destroy)(NSSLOWHASHContext *context); - unsigned int (*p_NSSLOWHASH_Length)(NSSLOWHASHContext *context); -}; - -typedef struct NSSLOWVectorStr NSSLOWVector; -#endif - SEC_BEGIN_PROTOS -#ifdef FREEBL_LOWHASH -typedef const NSSLOWVector * NSSLOWGetVectorFn(void); - -extern NSSLOWGetVectorFn NSSLOW_GetVector; -#endif - typedef const FREEBLVector * FREEBLGetVectorFn(void); extern FREEBLGetVectorFn FREEBL_GetVector; diff --git a/lib/freebl/lowhash_vector.c b/lib/freebl/lowhash_vector.c deleted file mode 100644 index 52fe6607c..000000000 --- a/lib/freebl/lowhash_vector.c +++ /dev/null @@ -1,217 +0,0 @@ -/* - * loader.c - load platform dependent DSO containing freebl implementation. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#define _GNU_SOURCE 1 -#include "loader.h" -#include "prmem.h" -#include "prerror.h" -#include "prinit.h" -#include "prenv.h" -#include "blname.c" - -#include "prio.h" -#include "prprf.h" -#include <stdio.h> -#include "prsystem.h" -#include "nsslowhash.h" -#include <dlfcn.h> -#include "pratom.h" - - -static PRLibrary* blLib; - -#define LSB(x) ((x)&0xff) -#define MSB(x) ((x)>>8) - -static const NSSLOWVector *vector; -static const char *libraryName = NULL; - -/* pretty much only glibc uses this, make sure we don't have any depenencies - * on nspr.. */ -#undef PORT_Alloc -#undef PORT_Free -#define PORT_Alloc malloc -#define PR_Malloc malloc -#define PORT_Free free -#define PR_Free free -#define PR_GetDirectorySeparator() '/' -#define PR_LoadLibraryWithFlags(libspec,flags) \ - (PRLibrary*)dlopen(libSpec.value.pathname,RTLD_NOW|RTLD_LOCAL) -#define PR_GetLibraryFilePathname(name,addr) \ - freebl_lowhash_getLibraryFilePath(addr) - -static char * -freebl_lowhash_getLibraryFilePath(void *addr) -{ - Dl_info dli; - if (dladdr(addr, &dli) == 0) { - return NULL; - } - return strdup(dli.dli_fname); -} - -/* - * The PR_LoadLibraryWithFlags call above defines this variable away, so we - * don't need it.. - */ -#ifdef nodef -static const char *NameOfThisSharedLib = - SHLIB_PREFIX"freebl"SHLIB_VERSION"."SHLIB_SUFFIX; -#endif - -#include "genload.c" - - -/* This function must be run only once. */ -/* determine if hybrid platform, then actually load the DSO. */ -static PRStatus -freebl_LoadDSO( void ) -{ - PRLibrary * handle; - const char * name = getLibName(); - - if (!name) { - /*PR_SetError(PR_LOAD_LIBRARY_ERROR,0); */ - return PR_FAILURE; - } - handle = loader_LoadLibrary(name); - if (handle) { - void *address = dlsym(handle, "NSSLOW_GetVector"); - if (address) { - NSSLOWGetVectorFn * getVector = (NSSLOWGetVectorFn *)address; - const NSSLOWVector * dsoVector = getVector(); - if (dsoVector) { - unsigned short dsoVersion = dsoVector->version; - unsigned short myVersion = NSSLOW_VERSION; - if (MSB(dsoVersion) == MSB(myVersion) && - LSB(dsoVersion) >= LSB(myVersion) && - dsoVector->length >= sizeof(NSSLOWVector)) { - vector = dsoVector; - libraryName = name; - blLib = handle; - return PR_SUCCESS; - } - } - } - (void)dlclose(handle); - } - return PR_FAILURE; -} - -static PRCallOnceType loadFreeBLOnce; -/* remove when NSPR pratom.h is updated. s390 has atomic intrinsics, - * but nspr doesn't know it. */ -#if defined(__s390__) || defined(__s390x__) -#undef PR_ATOMIC_SET -#define PR_ATOMIC_SET(val, newval) __sync_lock_test_and_set(val, newval) -#endif - -static PRStatus -freebl_RunLoaderOnce( void ) -{ - /* Don't have NSPR, so can use the real PR_CallOnce, implement a stripped - * down version. */ - if (loadFreeBLOnce.initialized) { - return loadFreeBLOnce.status; - } - /* PR_ATOMIC_SET macro is implemented with compiler intrinsics, if we don't - * have the intrinsic, it will be set to an NSPR PR_Atomic function, which - * will show up as missing at build time. If we get that missing function, - * Then we'll need to implement a PR_AtomicSet() function for that platform - */ - if (PR_ATOMIC_SET(&loadFreeBLOnce.inProgress,1) == 0) { - loadFreeBLOnce.status = freebl_LoadDSO(); - loadFreeBLOnce.initialized = 1; - } else { - /* shouldn't have a lot of takers on the else clause, which is good - * since we don't have condition variables yet. - * 'initialized' only ever gets set (not cleared) so we don't - * need the traditional locks. */ - while (!loadFreeBLOnce.initialized) { - sleep(1); /* don't have condition variables, just give up the CPU */ - } - } - - return loadFreeBLOnce.status; -} - -const FREEBLVector *FREEBL_GetVector(void) -{ - if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) - return NULL; - return (vector->p_FREEBL_GetVector)(); -} - -NSSLOWInitContext *NSSLOW_Init(void) -{ - if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) - return NULL; - return (vector->p_NSSLOW_Init)(); -} - -void NSSLOW_Shutdown(NSSLOWInitContext *context) -{ - if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) - return; - (vector->p_NSSLOW_Shutdown)(context); -} - -void NSSLOW_Reset(NSSLOWInitContext *context) -{ - if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) - return; - (vector->p_NSSLOW_Reset)(context); -} - -NSSLOWHASHContext *NSSLOWHASH_NewContext( - NSSLOWInitContext *initContext, - HASH_HashType hashType) -{ - if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) - return NULL; - return (vector->p_NSSLOWHASH_NewContext)(initContext, hashType); -} - -void NSSLOWHASH_Begin(NSSLOWHASHContext *context) -{ - if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) - return; - (vector->p_NSSLOWHASH_Begin)(context); -} - -void NSSLOWHASH_Update(NSSLOWHASHContext *context, - const unsigned char *buf, - unsigned int len) -{ - if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) - return; - (vector->p_NSSLOWHASH_Update)(context, buf, len); -} - -void NSSLOWHASH_End(NSSLOWHASHContext *context, - unsigned char *buf, - unsigned int *ret, unsigned int len) -{ - if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) - return; - (vector->p_NSSLOWHASH_End)(context, buf, ret, len); -} - -void NSSLOWHASH_Destroy(NSSLOWHASHContext *context) -{ - if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) - return; - (vector->p_NSSLOWHASH_Destroy)(context); -} - -unsigned int NSSLOWHASH_Length(NSSLOWHASHContext *context) -{ - if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) - return -1; - return (vector->p_NSSLOWHASH_Length)(context); -} - diff --git a/lib/freebl/manifest.mn b/lib/freebl/manifest.mn index a3659b310..1137e8521 100644 --- a/lib/freebl/manifest.mn +++ b/lib/freebl/manifest.mn @@ -10,30 +10,6 @@ CORE_DEPTH = ../.. MODULE = nss -# copied from Linux.mk. We have a chicken and egg issue here. We need to set -# Library name before we call the platform code in coreconf, but we need to -# Pick up the automatic setting of FREEBL_LOWHASH before we can set the -# Library name... so for now we mimic the code in Linux.mk to get the -# automatic setting early... -# -# On Linux 2.6 or later, build libfreebl3.so with no NSPR and libnssutil3.so -# dependencies by default. Set FREEBL_NO_DEPEND to 0 in the environment to -# override this. -# -# -include $(CORE_DEPTH)/coreconf/arch.mk -ifeq ($(OS_ARCH),Linux) -ifneq ($(OS_TARGET),Android) -ifeq (2.6,$(firstword $(sort 2.6 $(OS_RELEASE)))) -ifndef FREEBL_NO_DEPEND -FREEBL_NO_DEPEND = 1 -FREEBL_LOWHASH = 1 -endif -endif -endif -endif - - LIBRARY_NAME = freebl LIBRARY_VERSION = 3 @@ -53,13 +29,6 @@ ifdef FREEBL_CHILD_BUILD ifdef USE_ABI64_FPU LIBRARY_NAME = freebl_64fpu endif - ifdef FREEBL_LOWHASH - LIBRARY_NAME = freeblpriv - endif - ifdef USE_STUB_BUILD - # for the stub build, reset name to the default (from freeblpriv) - LIBRARY_NAME = freebl - endif endif # if the library name contains _, we prefix the version with _ @@ -134,7 +103,6 @@ CSRCS = \ drbg.c \ cts.c \ ctr.c \ - fipsfreebl.c \ gcm.c \ hmacct.c \ rijndael.c \ diff --git a/lib/freebl/mpi/mpprime.c b/lib/freebl/mpi/mpprime.c index 6e7dd02a8..9b97fb206 100644 --- a/lib/freebl/mpi/mpprime.c +++ b/lib/freebl/mpi/mpprime.c @@ -410,32 +410,31 @@ mp_err mpp_make_prime(mp_int *start, mp_size nBits, mp_size strong, MP_DIGITS(&q) = 0; MP_CHECKOK( mp_init(&trial) ); MP_CHECKOK( mp_init(&q) ); - /* values originally taken from table 4.4, - * HandBook of Applied Cryptography, augmented by FIPS-186 - * requirements, Table C.2 and C.3 */ - if (nBits >= 2000) { + /* values taken from table 4.4, HandBook of Applied Cryptography */ + if (nBits >= 1300) { + num_tests = 2; + } else if (nBits >= 850) { num_tests = 3; - } else if (nBits >= 1536) { + } else if (nBits >= 650) { num_tests = 4; - } else if (nBits >= 1024) { - num_tests = 5; } else if (nBits >= 550) { - num_tests = 6; + num_tests = 5; } else if (nBits >= 450) { - num_tests = 7; + num_tests = 6; } else if (nBits >= 400) { - num_tests = 8; + num_tests = 7; } else if (nBits >= 350) { - num_tests = 9; + num_tests = 8; } else if (nBits >= 300) { - num_tests = 10; + num_tests = 9; } else if (nBits >= 250) { - num_tests = 20; + num_tests = 12; } else if (nBits >= 200) { - num_tests = 41; + num_tests = 15; + } else if (nBits >= 150) { + num_tests = 18; } else if (nBits >= 100) { - num_tests = 38; /* funny anomaly in the FIPS tables, for aux primes, the - * required more iterations for larger aux primes */ + num_tests = 27; } else num_tests = 50; diff --git a/lib/freebl/nsslowhash.c b/lib/freebl/nsslowhash.c index 4da9aac8d..a9ab5b738 100644 --- a/lib/freebl/nsslowhash.c +++ b/lib/freebl/nsslowhash.c @@ -7,11 +7,244 @@ #endif #include "prtypes.h" #include "secerr.h" +#include "pkcs11t.h" #include "blapi.h" #include "hasht.h" #include "plhash.h" #include "nsslowhash.h" -#include "blapii.h" + +/* FIPS preprocessor directives for message digests */ +#define FIPS_KNOWN_HASH_MESSAGE_LENGTH 64 /* 512-bits */ + +/* Known Hash Message (512-bits). Used for all hashes (incl. SHA-N [N>1]). */ +static const PRUint8 known_hash_message[] = { + "The test message for the MD2, MD5, and SHA-1 hashing algorithms." }; + +static CK_RV +freebl_fips_MD2_PowerUpSelfTest( void ) +{ + /* MD2 Known Digest Message (128-bits). */ + static const PRUint8 md2_known_digest[] = { + 0x41,0x5a,0x12,0xb2,0x3f,0x28,0x97,0x17, + 0x0c,0x71,0x4e,0xcc,0x40,0xc8,0x1d,0x1b}; + + /* MD2 variables. */ + MD2Context * md2_context; + unsigned int md2_bytes_hashed; + PRUint8 md2_computed_digest[MD2_LENGTH]; + + + /***********************************************/ + /* MD2 Single-Round Known Answer Hashing Test. */ + /***********************************************/ + + md2_context = MD2_NewContext(); + + if( md2_context == NULL ) + return( CKR_HOST_MEMORY ); + + MD2_Begin( md2_context ); + + MD2_Update( md2_context, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + MD2_End( md2_context, md2_computed_digest, &md2_bytes_hashed, MD2_LENGTH ); + + MD2_DestroyContext( md2_context , PR_TRUE ); + + if( ( md2_bytes_hashed != MD2_LENGTH ) || + ( PORT_Memcmp( md2_computed_digest, md2_known_digest, + MD2_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + + + +static CK_RV +freebl_fips_MD5_PowerUpSelfTest( void ) +{ + /* MD5 Known Digest Message (128-bits). */ + static const PRUint8 md5_known_digest[] = { + 0x25,0xc8,0xc0,0x10,0xc5,0x6e,0x68,0x28, + 0x28,0xa4,0xa5,0xd2,0x98,0x9a,0xea,0x2d}; + + /* MD5 variables. */ + PRUint8 md5_computed_digest[MD5_LENGTH]; + SECStatus md5_status; + + + /***********************************************/ + /* MD5 Single-Round Known Answer Hashing Test. */ + /***********************************************/ + + md5_status = MD5_HashBuf( md5_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( md5_status != SECSuccess ) || + ( PORT_Memcmp( md5_computed_digest, md5_known_digest, + MD5_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + +static CK_RV +freebl_fips_SHA_PowerUpSelfTest( void ) +{ + /* SHA-1 Known Digest Message (160-bits). */ + static const PRUint8 sha1_known_digest[] = { + 0x0a,0x6d,0x07,0xba,0x1e,0xbd,0x8a,0x1b, + 0x72,0xf6,0xc7,0x22,0xf1,0x27,0x9f,0xf0, + 0xe0,0x68,0x47,0x7a}; + + /* SHA-224 Known Digest Message (224-bits). */ + static const PRUint8 sha224_known_digest[] = { + 0x89,0x5e,0x7f,0xfd,0x0e,0xd8,0x35,0x6f, + 0x64,0x6d,0xf2,0xde,0x5e,0xed,0xa6,0x7f, + 0x29,0xd1,0x12,0x73,0x42,0x84,0x95,0x4f, + 0x8e,0x08,0xe5,0xcb}; + + /* SHA-256 Known Digest Message (256-bits). */ + static const PRUint8 sha256_known_digest[] = { + 0x38,0xa9,0xc1,0xf0,0x35,0xf6,0x5d,0x61, + 0x11,0xd4,0x0b,0xdc,0xce,0x35,0x14,0x8d, + 0xf2,0xdd,0xaf,0xaf,0xcf,0xb7,0x87,0xe9, + 0x96,0xa5,0xd2,0x83,0x62,0x46,0x56,0x79}; + + /* SHA-384 Known Digest Message (384-bits). */ + static const PRUint8 sha384_known_digest[] = { + 0x11,0xfe,0x1c,0x00,0x89,0x48,0xde,0xb3, + 0x99,0xee,0x1c,0x18,0xb4,0x10,0xfb,0xfe, + 0xe3,0xa8,0x2c,0xf3,0x04,0xb0,0x2f,0xc8, + 0xa3,0xc4,0x5e,0xea,0x7e,0x60,0x48,0x7b, + 0xce,0x2c,0x62,0xf7,0xbc,0xa7,0xe8,0xa3, + 0xcf,0x24,0xce,0x9c,0xe2,0x8b,0x09,0x72}; + + /* SHA-512 Known Digest Message (512-bits). */ + static const PRUint8 sha512_known_digest[] = { + 0xc8,0xb3,0x27,0xf9,0x0b,0x24,0xc8,0xbf, + 0x4c,0xba,0x33,0x54,0xf2,0x31,0xbf,0xdb, + 0xab,0xfd,0xb3,0x15,0xd7,0xfa,0x48,0x99, + 0x07,0x60,0x0f,0x57,0x41,0x1a,0xdd,0x28, + 0x12,0x55,0x25,0xac,0xba,0x3a,0x99,0x12, + 0x2c,0x7a,0x8f,0x75,0x3a,0xe1,0x06,0x6f, + 0x30,0x31,0xc9,0x33,0xc6,0x1b,0x90,0x1a, + 0x6c,0x98,0x9a,0x87,0xd0,0xb2,0xf8,0x07}; + + /* SHA-X variables. */ + PRUint8 sha_computed_digest[HASH_LENGTH_MAX]; + SECStatus sha_status; + + /*************************************************/ + /* SHA-1 Single-Round Known Answer Hashing Test. */ + /*************************************************/ + + sha_status = SHA1_HashBuf( sha_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( sha_status != SECSuccess ) || + ( PORT_Memcmp( sha_computed_digest, sha1_known_digest, + SHA1_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* SHA-224 Single-Round Known Answer Hashing Test. */ + /***************************************************/ + + sha_status = SHA224_HashBuf( sha_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( sha_status != SECSuccess ) || + ( PORT_Memcmp( sha_computed_digest, sha224_known_digest, + SHA224_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* SHA-256 Single-Round Known Answer Hashing Test. */ + /***************************************************/ + + sha_status = SHA256_HashBuf( sha_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( sha_status != SECSuccess ) || + ( PORT_Memcmp( sha_computed_digest, sha256_known_digest, + SHA256_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* SHA-384 Single-Round Known Answer Hashing Test. */ + /***************************************************/ + + sha_status = SHA384_HashBuf( sha_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( sha_status != SECSuccess ) || + ( PORT_Memcmp( sha_computed_digest, sha384_known_digest, + SHA384_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* SHA-512 Single-Round Known Answer Hashing Test. */ + /***************************************************/ + + sha_status = SHA512_HashBuf( sha_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( sha_status != SECSuccess ) || + ( PORT_Memcmp( sha_computed_digest, sha512_known_digest, + SHA512_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + + +static CK_RV +freebl_fipsSoftwareIntegrityTest(void) +{ + CK_RV crv = CKR_OK; + + /* make sure that our check file signatures are OK */ + if (!BLAPI_VerifySelf(SHLIB_PREFIX"freebl"SHLIB_VERSION"."SHLIB_SUFFIX)) { + crv = CKR_DEVICE_ERROR; /* better error code? checksum error? */ + } + return crv; +} + +CK_RV +freebl_fipsPowerUpSelfTest( void ) +{ + CK_RV rv; + + /* MD2 Power-Up SelfTest(s). */ + rv = freebl_fips_MD2_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* MD5 Power-Up SelfTest(s). */ + rv = freebl_fips_MD5_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* SHA-X Power-Up SelfTest(s). */ + rv = freebl_fips_SHA_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* Software/Firmware Integrity Test. */ + rv = freebl_fipsSoftwareIntegrityTest(); + + if( rv != CKR_OK ) + return rv; + + /* Passed Power-Up SelfTest(s). */ + return( CKR_OK ); +} struct NSSLOWInitContextStr { int count; @@ -43,28 +276,36 @@ static int nsslow_GetFIPSEnabled(void) { return 1; } + +static int post = 0; +static int post_failed = 0; + static NSSLOWInitContext dummyContext = { 0 }; -static PRBool post_failed = PR_TRUE; NSSLOWInitContext * NSSLOW_Init(void) { + CK_RV crv; #ifdef FREEBL_NO_DEPEND - (void) FREEBL_InitStubs(); + (void)FREEBL_InitStubs(); #endif - /* make sure the FIPS product is installed if we are trying to - * go into FIPS mode */ - if (nsslow_GetFIPSEnabled()) { - if (BL_FIPSEntryOK(PR_TRUE) != SECSuccess) { - PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); - post_failed = PR_TRUE; + if (post_failed) { + return NULL; + } + + + if (!post && nsslow_GetFIPSEnabled()) { + crv = freebl_fipsPowerUpSelfTest(); + if (crv != CKR_OK) { + post_failed = 1; return NULL; } - } - post_failed = PR_FALSE; + } + post = 1; + - return &dummyContext; + return &dummyContext; } void @@ -78,6 +319,8 @@ void NSSLOW_Reset(NSSLOWInitContext *context) { PORT_Assert(context == &dummyContext); + post_failed = 0; + post = 0; return; } diff --git a/lib/freebl/pqg.c b/lib/freebl/pqg.c index 86a339ab0..fd1351ed2 100644 --- a/lib/freebl/pqg.c +++ b/lib/freebl/pqg.c @@ -701,7 +701,6 @@ cleanup: mp_clear(&a); mp_clear(&z); mp_clear(&two_length_minus_1); - PORT_Memset(x, 0, sizeof(x)); if (err) { MP_TO_SEC_ERROR(err); rv = SECFailure; @@ -857,7 +856,6 @@ cleanup: mp_clear(&c); mp_clear(&c0); mp_clear(&one); - PORT_Memset(x, 0, sizeof(x)); if (err) { MP_TO_SEC_ERROR(err); rv = SECFailure; @@ -1258,42 +1256,6 @@ pqg_ParamGen(unsigned int L, unsigned int N, pqgGenType type, PORT_SetError(SEC_ERROR_INVALID_ARGS); return SECFailure; } - - /* Initialize bignums */ - MP_DIGITS(&P) = 0; - MP_DIGITS(&Q) = 0; - MP_DIGITS(&G) = 0; - MP_DIGITS(&H) = 0; - MP_DIGITS(&l) = 0; - MP_DIGITS(&p0) = 0; - CHECK_MPI_OK( mp_init(&P) ); - CHECK_MPI_OK( mp_init(&Q) ); - CHECK_MPI_OK( mp_init(&G) ); - CHECK_MPI_OK( mp_init(&H) ); - CHECK_MPI_OK( mp_init(&l) ); - CHECK_MPI_OK( mp_init(&p0) ); - - /* parameters have been passed in, only generate G */ - if (*pParams != NULL) { - /* we only support G index generation if generating separate from PQ */ - if ((*pVfy != NULL) || (type == FIPS186_1_TYPE) || - ((*pVfy)->h.len != 1) || ((*pVfy)->h.data == NULL) || - ((*pVfy)->seed.data == NULL) || ((*pVfy)->seed.len == 0)) { - PORT_SetError(SEC_ERROR_INVALID_ARGS); - return SECFailure; - } - params = *pParams; - verify = *pVfy; - - /* fill in P Q, */ - SECITEM_TO_MPINT((*pParams)->prime, &P); - SECITEM_TO_MPINT((*pParams)->subPrime, &Q); - hashtype = getFirstHash(L,N); - CHECK_SEC_OK(makeGfromIndex(hashtype, &P, &Q, &(*pVfy)->seed, - (*pVfy)->h.data[0], &G) ); - MPINT_TO_SECITEM(&G, &(*pParams)->base, (*pParams)->arena); - goto cleanup; - } /* Initialize an arena for the params. */ arena = PORT_NewArena(NSS_FREEBL_DEFAULT_CHUNKSIZE); if (!arena) { @@ -1551,12 +1513,8 @@ cleanup: rv = SECFailure; } if (rv) { - if (params) { - PORT_FreeArena(params->arena, PR_TRUE); - } - if (verify) { - PORT_FreeArena(verify->arena, PR_TRUE); - } + PORT_FreeArena(params->arena, PR_TRUE); + PORT_FreeArena(verify->arena, PR_TRUE); } if (hit.data) { SECITEM_FreeItem(&hit, PR_FALSE); diff --git a/lib/freebl/rijndael.c b/lib/freebl/rijndael.c index 15e841a3c..4e4be79fd 100644 --- a/lib/freebl/rijndael.c +++ b/lib/freebl/rijndael.c @@ -1164,7 +1164,6 @@ AES_InitContext(AESContext *cx, const unsigned char *key, unsigned int keysize, AES_DestroyContext(cx, PR_FALSE); return rv; } - cx->mode = mode; /* finally, set up any mode specific contexts */ switch (mode) { @@ -1288,23 +1287,6 @@ AES_Encrypt(AESContext *cx, unsigned char *output, return SECFailure; } *outputLen = inputLen; -#if UINT_MAX > MP_32BIT_MAX - /* - * we can guarentee that GSM won't overlfow if we limit the input to - * 2^36 bytes. For simplicity, we are limiting it to 2^32 for now. - * - * We do it here to cover both hardware and software GCM operations. - */ - PR_STATIC_ASSERT(sizeof(unsigned int) > 4); - if ((cx->mode == NSS_AES_GCM) && (inputLen > MP_32_BIT_MAX)) { - PORT_SetError(SEC_ERROR_OUTPUT_LEN); - return SECFailure; - } -#else - /* if we can't pass in a 32_bit number, then no such check needed */ - PR_STATIC_ASSERT(sizeof(unsigned int) <= 4); -#endif - return (*cx->worker)(cx->worker_cx, output, outputLen, maxOutputLen, input, inputLen, blocksize); } diff --git a/lib/freebl/rijndael.h b/lib/freebl/rijndael.h index 5793dc4ef..5f790587f 100644 --- a/lib/freebl/rijndael.h +++ b/lib/freebl/rijndael.h @@ -62,7 +62,6 @@ struct AESContextStr freeblDestroyFunc destroy; void *worker_cx; PRBool isBlock; - int mode; }; #endif /* _RIJNDAEL_H_ */ diff --git a/lib/freebl/rsa.c b/lib/freebl/rsa.c index f62de2e1a..f885acc44 100644 --- a/lib/freebl/rsa.c +++ b/lib/freebl/rsa.c @@ -138,7 +138,7 @@ rsa_build_from_primes(const mp_int *p, const mp_int *q, CHECK_MPI_OK( mp_sub_d(p, 1, &psub1) ); CHECK_MPI_OK( mp_sub_d(q, 1, &qsub1) ); if (needPublicExponent || needPrivateExponent) { - CHECK_MPI_OK( mp_lcm(&psub1, &qsub1, &phi) ); + CHECK_MPI_OK( mp_mul(&psub1, &qsub1, &phi) ); /* 3. Compute d = e**-1 mod(phi) */ /* or e = d**-1 mod(phi) as necessary */ if (needPublicExponent) { @@ -226,45 +226,6 @@ cleanup: } /* - * make sure the key components meet fips186 requirements. - */ -static PRBool -rsa_fips186_verify(mp_int *p, mp_int *q, mp_int *d, int keySizeInBits) -{ - mp_int pq_diff; - mp_err err = MP_OKAY; - PRBool ret=PR_FALSE; - - if (keySizeInBits < 250) { - /* not a valid FIPS length, no point in our other tests */ - /* if you are here, and in FIPS mode, you are outside the security - * policy */ - return PR_TRUE; - } - - /* p & q are already known to be greater then sqrt(2)*2^(keySize/2-1) */ - /* we also know that gcd(p-1,e) = 1 and gcd(q-1,e) = 1 because the - * mp_invmod() function will fail. */ - /* now check p-q > 2^(keysize/2-100) */ - MP_DIGITS(&pq_diff) = 0; - CHECK_MPI_OK( mp_init(&pq_diff) ); - /* NSS always has p > q, so we know pq_diff is positive */ - CHECK_MPI_OK( mp_sub(p,q,&pq_diff) ); - if ((unsigned)mpl_significant_bits(&pq_diff) < (keySizeInBits/2 - 100)) { - goto cleanup; - } - /* now verify d is large enough*/ - if ((unsigned)mpl_significant_bits(d) < (keySizeInBits/2)) { - goto cleanup; - } - ret = PR_TRUE; - -cleanup: - mp_clear(&pq_diff); - return ret; -} - -/* ** Generate and return a new RSA public and private key. ** Both keys are encoded in a single RSAPrivateKey structure. ** "cx" is the random number generator context @@ -280,7 +241,6 @@ RSA_NewKey(int keySizeInBits, SECItem *publicExponent) unsigned int primeLen; mp_int p, q, e, d; int kiter; - int max_attempts; mp_err err = MP_OKAY; SECStatus rv = SECSuccess; int prerr = 0; @@ -321,7 +281,6 @@ RSA_NewKey(int keySizeInBits, SECItem *publicExponent) /* 3. Set the public exponent */ SECITEM_TO_MPINT(*publicExponent, &e); kiter = 0; - max_attempts = 5*(keySizeInBits/2); /* FIPS 186-4 B.3.3 steps 4.7 and 5.8 */ do { prerr = 0; PORT_SetError(0); @@ -339,17 +298,12 @@ RSA_NewKey(int keySizeInBits, SECItem *publicExponent) &e, PR_FALSE, /* needPublicExponent=false */ &d, PR_TRUE, /* needPrivateExponent=true */ key, keySizeInBits); - if (rv == SECSuccess) { - if (rsa_fips186_verify(&p, &q, &d, keySizeInBits) ){ - break; - } - prerr = SEC_ERROR_NEED_RANDOM; /* retry with different values */ - } else { - prerr = PORT_GetError(); - } + if (rv == SECSuccess) + break; /* generated two good primes */ + prerr = PORT_GetError(); kiter++; /* loop until have primes */ - } while (prerr == SEC_ERROR_NEED_RANDOM && kiter < max_attempts); + } while (prerr == SEC_ERROR_NEED_RANDOM && kiter < MAX_KEY_GEN_ATTEMPTS); if (prerr) goto cleanup; cleanup: diff --git a/lib/freebl/shvfy.c b/lib/freebl/shvfy.c index 5ff08b158..ad64a26a2 100644 --- a/lib/freebl/shvfy.c +++ b/lib/freebl/shvfy.c @@ -16,7 +16,6 @@ #include "prmem.h" #include "hasht.h" #include "pqg.h" -#include "blapii.h" /* * Most modern version of Linux support a speed optimization scheme where an @@ -274,10 +273,8 @@ readItem(PRFileDesc *fd, SECItem *item) return SECSuccess; } -static PRBool blapi_SHVerifyFile(const char *shName, PRBool self); - -static PRBool -blapi_SHVerify(const char *name, PRFuncPtr addr, PRBool self) +PRBool +BLAPI_SHVerify(const char *name, PRFuncPtr addr) { PRBool result = PR_FALSE; /* if anything goes wrong, * the signature does not verify */ @@ -286,7 +283,7 @@ blapi_SHVerify(const char *name, PRFuncPtr addr, PRBool self) if (!shName) { goto loser; } - result = blapi_SHVerifyFile(shName, self); + result = BLAPI_SHVerifyFile(shName); loser: if (shName != NULL) { @@ -297,20 +294,8 @@ loser: } PRBool -BLAPI_SHVerify(const char *name, PRFuncPtr addr) -{ - return blapi_SHVerify(name, addr, PR_FALSE); -} - -PRBool BLAPI_SHVerifyFile(const char *shName) { - return blapi_SHVerifyFile(shName, PR_FALSE); -} - -static PRBool -blapi_SHVerifyFile(const char *shName, PRBool self) -{ char *checkName = NULL; PRFileDesc *checkFD = NULL; PRFileDesc *shFD = NULL; @@ -335,12 +320,6 @@ blapi_SHVerifyFile(const char *shName, PRBool self) hash.data = hashBuf; hash.len = sizeof(hashBuf); - /* If our integrity check was never ran or failed, fail any other - * integrity checks to prevent any token going into FIPS mode. */ - if (!self && (BL_FIPSEntryOK(PR_FALSE) != SECSuccess)) { - return PR_FALSE; - } - if (!shName) { goto loser; } @@ -525,5 +504,5 @@ BLAPI_VerifySelf(const char *name) */ return PR_TRUE; } - return blapi_SHVerify(name, (PRFuncPtr) decodeInt, PR_TRUE); + return BLAPI_SHVerify(name, (PRFuncPtr) decodeInt); } diff --git a/lib/freebl/stubs.c b/lib/freebl/stubs.c index 48bd1bebe..993d01e18 100644 --- a/lib/freebl/stubs.c +++ b/lib/freebl/stubs.c @@ -83,7 +83,7 @@ /* * this uses the loader weak attribute. it works automatically, but once * freebl is loaded, the symbols are 'fixed' (later loading of NSPR or - * libutil will not resolve these symbols). + * libutil will not resolve these symbols. */ #define STUB_DECLARE(ret, fn, args) \ @@ -116,7 +116,6 @@ STUB_DECLARE(void *,PORT_ZAlloc_Util,(size_t len)); STUB_DECLARE(void,PORT_ZFree_Util,(void *ptr, size_t len)); STUB_DECLARE(void,PR_Assert,(const char *s, const char *file, PRIntn ln)); -STUB_DECLARE(PRStatus,PR_Access,(const char *name, PRAccessHow how)); STUB_DECLARE(PRStatus,PR_CallOnce,(PRCallOnceType *once, PRCallOnceFN func)); STUB_DECLARE(PRStatus,PR_Close,(PRFileDesc *fd)); STUB_DECLARE(void,PR_DestroyLock,(PRLock *lock)); @@ -342,28 +341,6 @@ PR_Seek_stub(PRFileDesc *fd, PROffset32 offset, PRSeekWhence whence) return lseek(*lfd, offset, lwhence); } -PRStatus PR_Access_stub(const char *name, PRAccessHow how) -{ - int mode = F_OK; - int rv; - STUB_SAFE_CALL2(PR_Access, name, how); - switch (how) { - case PR_ACCESS_WRITE_OK: - mode = W_OK; - break; - case PR_ACCESS_READ_OK: - mode = R_OK; - break; - /* assume F_OK for all others */ - default: - break; - } - rv = access(name, mode); - if (rv == 0) { - return PR_SUCCESS; - } - return PR_FAILURE; -} /* * library @@ -582,7 +559,6 @@ freebl_InitNSPR(void *lib) STUB_FETCH_FUNCTION(PR_Seek); STUB_FETCH_FUNCTION(PR_GetLibraryFilePathname); STUB_FETCH_FUNCTION(PR_Assert); - STUB_FETCH_FUNCTION(PR_Access); STUB_FETCH_FUNCTION(PR_Sleep); STUB_FETCH_FUNCTION(PR_CallOnce); STUB_FETCH_FUNCTION(PR_NewCondVar); diff --git a/lib/freebl/stubs.h b/lib/freebl/stubs.h index fd6683f16..72f30000c 100644 --- a/lib/freebl/stubs.h +++ b/lib/freebl/stubs.h @@ -40,7 +40,6 @@ #define NSS_SecureMemcmp NSS_SecureMemcmp_stub #define PR_Assert PR_Assert_stub -#define PR_Access PR_Access_stub #define PR_CallOnce PR_CallOnce_stub #define PR_Close PR_Close_stub #define PR_DestroyCondVar PR_DestroyCondVar_stub diff --git a/lib/softoken/Makefile b/lib/softoken/Makefile index 4eccfd77c..b2f33e260 100644 --- a/lib/softoken/Makefile +++ b/lib/softoken/Makefile @@ -20,19 +20,6 @@ include $(CORE_DEPTH)/coreconf/config.mk # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### -ifdef NSS_NO_INIT_SUPPORT - DEFINES += -DNSS_NO_INIT_SUPPORT -endif -ifeq ($(OS_TARGET),Linux) -ifeq ($(CPU_ARCH),ppc) -ifdef USE_64 - DEFINES += -DNSS_NO_INIT_SUPPORT -endif # USE_64 -endif # ppc -else # !Linux - # turn off no init support everywhere for now - DEFINES += -DNSS_NO_INIT_SUPPORT -endif # Linux ####################################################################### diff --git a/lib/softoken/fipstest.c b/lib/softoken/fipstest.c index fdb48e287..aed33bb0a 100644 --- a/lib/softoken/fipstest.c +++ b/lib/softoken/fipstest.c @@ -5,70 +5,52 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "seccomon.h" -#include "blapi.h" -#include "softoken.h" -#include "lowkeyi.h" -#include "secoid.h" +#include "softoken.h" /* Required for RC2-ECB, RC2-CBC, RC4, DES-ECB, */ + /* DES-CBC, DES3-ECB, DES3-CBC, RSA */ + /* and DSA. */ +#include "seccomon.h" /* Required for RSA and DSA. */ +#include "lowkeyi.h" /* Required for RSA and DSA. */ +#include "pkcs11.h" /* Required for PKCS #11. */ #include "secerr.h" -/* - * different platforms have different ways of calling and initial entry point - * when the dll/.so is loaded. Most platforms support either a posix pragma - * or the GCC attribute. Some platforms suppor a pre-defined name, and some - * platforms have a link line way of invoking this function. - */ -#ifndef NSS_NO_INIT_SUPPORT -/* The pragma */ -#if defined(USE_INIT_PRAGMA) -#pragma init(sftk_startup_tests) +#ifndef NSS_DISABLE_ECC +#include "ec.h" /* Required for ECDSA */ #endif -/* GCC Attribute */ -#if defined(__GNUC__) -#define INIT_FUNCTION __attribute__((constructor)) -#else -#define INIT_FUNCTION -#endif -static void INIT_FUNCTION sftk_startup_tests(void); +/* FIPS preprocessor directives for RC2-ECB and RC2-CBC. */ +#define FIPS_RC2_KEY_LENGTH 5 /* 40-bits */ +#define FIPS_RC2_ENCRYPT_LENGTH 8 /* 64-bits */ +#define FIPS_RC2_DECRYPT_LENGTH 8 /* 64-bits */ -/* Windows pre-defined entry */ -#ifdef XP_WIN -#include <windows.h> -#include <primpl.h> -BOOL WINAPI DllMain( - HINSTANCE hinstDLL, // handle to DLL module - DWORD fdwReason, // reason for calling function - LPVOID lpReserved ) // reserved -{ - // Perform actions based on the reason for calling. - switch( fdwReason ) - { - case DLL_PROCESS_ATTACH: - // Initialize once for each new process. - // Return FALSE to fail DLL load. - sftk_startup_tests(); - break; - - case DLL_THREAD_ATTACH: - // Do thread-specific initialization. - break; - - case DLL_THREAD_DETACH: - // Do thread-specific cleanup. - break; - - case DLL_PROCESS_DETACH: - // Perform any necessary cleanup. - break; - } - return TRUE; // Successful DLL_PROCESS_ATTACH. -} -#endif -#endif /* !NSS_NO_INIT_SUPPORT */ +/* FIPS preprocessor directives for RC4. */ +#define FIPS_RC4_KEY_LENGTH 5 /* 40-bits */ +#define FIPS_RC4_ENCRYPT_LENGTH 8 /* 64-bits */ +#define FIPS_RC4_DECRYPT_LENGTH 8 /* 64-bits */ + + +/* FIPS preprocessor directives for DES-ECB and DES-CBC. */ +#define FIPS_DES_ENCRYPT_LENGTH 8 /* 64-bits */ +#define FIPS_DES_DECRYPT_LENGTH 8 /* 64-bits */ + + +/* FIPS preprocessor directives for DES3-CBC and DES3-ECB. */ +#define FIPS_DES3_ENCRYPT_LENGTH 8 /* 64-bits */ +#define FIPS_DES3_DECRYPT_LENGTH 8 /* 64-bits */ + + +/* FIPS preprocessor directives for AES-ECB and AES-CBC. */ +#define FIPS_AES_BLOCK_SIZE 16 /* 128-bits */ +#define FIPS_AES_ENCRYPT_LENGTH 16 /* 128-bits */ +#define FIPS_AES_DECRYPT_LENGTH 16 /* 128-bits */ +#define FIPS_AES_128_KEY_SIZE 16 /* 128-bits */ +#define FIPS_AES_192_KEY_SIZE 24 /* 192-bits */ +#define FIPS_AES_256_KEY_SIZE 32 /* 256-bits */ + +/* FIPS preprocessor directives for message digests */ +#define FIPS_KNOWN_HASH_MESSAGE_LENGTH 64 /* 512-bits */ /* FIPS preprocessor directives for RSA. */ @@ -87,8 +69,1001 @@ BOOL WINAPI DllMain( #define FIPS_RSA_SIGNATURE_LENGTH 256 /* 2048-bits */ #define FIPS_RSA_MODULUS_LENGTH 256 /* 2048-bits */ + +/* FIPS preprocessor directives for DSA. */ +#define FIPS_DSA_TYPE siBuffer +#define FIPS_DSA_DIGEST_LENGTH 20 /* 160-bits */ +#define FIPS_DSA_SUBPRIME_LENGTH 20 /* 160-bits */ +#define FIPS_DSA_SIGNATURE_LENGTH 40 /* 320-bits */ +#define FIPS_DSA_PRIME_LENGTH 128 /* 1024-bits */ +#define FIPS_DSA_BASE_LENGTH 128 /* 1024-bits */ + +/* FIPS preprocessor directives for RNG. */ +#define FIPS_RNG_XKEY_LENGTH 32 /* 256-bits */ + +static CK_RV +sftk_fips_RC2_PowerUpSelfTest( void ) +{ + /* RC2 Known Key (40-bits). */ + static const PRUint8 rc2_known_key[] = { "RSARC" }; + + /* RC2-CBC Known Initialization Vector (64-bits). */ + static const PRUint8 rc2_cbc_known_initialization_vector[] = {"Security"}; + + /* RC2 Known Plaintext (64-bits). */ + static const PRUint8 rc2_ecb_known_plaintext[] = {"Netscape"}; + static const PRUint8 rc2_cbc_known_plaintext[] = {"Netscape"}; + + /* RC2 Known Ciphertext (64-bits). */ + static const PRUint8 rc2_ecb_known_ciphertext[] = { + 0x1a,0x71,0x33,0x54,0x8d,0x5c,0xd2,0x30}; + static const PRUint8 rc2_cbc_known_ciphertext[] = { + 0xff,0x41,0xdb,0x94,0x8a,0x4c,0x33,0xb3}; + + /* RC2 variables. */ + PRUint8 rc2_computed_ciphertext[FIPS_RC2_ENCRYPT_LENGTH]; + PRUint8 rc2_computed_plaintext[FIPS_RC2_DECRYPT_LENGTH]; + RC2Context * rc2_context; + unsigned int rc2_bytes_encrypted; + unsigned int rc2_bytes_decrypted; + SECStatus rc2_status; + + + /******************************************************/ + /* RC2-ECB Single-Round Known Answer Encryption Test: */ + /******************************************************/ + + rc2_context = RC2_CreateContext( rc2_known_key, FIPS_RC2_KEY_LENGTH, + NULL, NSS_RC2, + FIPS_RC2_KEY_LENGTH ); + + if( rc2_context == NULL ) + return( CKR_HOST_MEMORY ); + + rc2_status = RC2_Encrypt( rc2_context, rc2_computed_ciphertext, + &rc2_bytes_encrypted, FIPS_RC2_ENCRYPT_LENGTH, + rc2_ecb_known_plaintext, + FIPS_RC2_DECRYPT_LENGTH ); + + RC2_DestroyContext( rc2_context, PR_TRUE ); + + if( ( rc2_status != SECSuccess ) || + ( rc2_bytes_encrypted != FIPS_RC2_ENCRYPT_LENGTH ) || + ( PORT_Memcmp( rc2_computed_ciphertext, rc2_ecb_known_ciphertext, + FIPS_RC2_ENCRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /******************************************************/ + /* RC2-ECB Single-Round Known Answer Decryption Test: */ + /******************************************************/ + + rc2_context = RC2_CreateContext( rc2_known_key, FIPS_RC2_KEY_LENGTH, + NULL, NSS_RC2, + FIPS_RC2_KEY_LENGTH ); + + if( rc2_context == NULL ) + return( CKR_HOST_MEMORY ); + + rc2_status = RC2_Decrypt( rc2_context, rc2_computed_plaintext, + &rc2_bytes_decrypted, FIPS_RC2_DECRYPT_LENGTH, + rc2_ecb_known_ciphertext, + FIPS_RC2_ENCRYPT_LENGTH ); + + RC2_DestroyContext( rc2_context, PR_TRUE ); + + if( ( rc2_status != SECSuccess ) || + ( rc2_bytes_decrypted != FIPS_RC2_DECRYPT_LENGTH ) || + ( PORT_Memcmp( rc2_computed_plaintext, rc2_ecb_known_plaintext, + FIPS_RC2_DECRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /******************************************************/ + /* RC2-CBC Single-Round Known Answer Encryption Test: */ + /******************************************************/ + + rc2_context = RC2_CreateContext( rc2_known_key, FIPS_RC2_KEY_LENGTH, + rc2_cbc_known_initialization_vector, + NSS_RC2_CBC, FIPS_RC2_KEY_LENGTH ); + + if( rc2_context == NULL ) + return( CKR_HOST_MEMORY ); + + rc2_status = RC2_Encrypt( rc2_context, rc2_computed_ciphertext, + &rc2_bytes_encrypted, FIPS_RC2_ENCRYPT_LENGTH, + rc2_cbc_known_plaintext, + FIPS_RC2_DECRYPT_LENGTH ); + + RC2_DestroyContext( rc2_context, PR_TRUE ); + + if( ( rc2_status != SECSuccess ) || + ( rc2_bytes_encrypted != FIPS_RC2_ENCRYPT_LENGTH ) || + ( PORT_Memcmp( rc2_computed_ciphertext, rc2_cbc_known_ciphertext, + FIPS_RC2_ENCRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /******************************************************/ + /* RC2-CBC Single-Round Known Answer Decryption Test: */ + /******************************************************/ + + rc2_context = RC2_CreateContext( rc2_known_key, FIPS_RC2_KEY_LENGTH, + rc2_cbc_known_initialization_vector, + NSS_RC2_CBC, FIPS_RC2_KEY_LENGTH ); + + if( rc2_context == NULL ) + return( CKR_HOST_MEMORY ); + + rc2_status = RC2_Decrypt( rc2_context, rc2_computed_plaintext, + &rc2_bytes_decrypted, FIPS_RC2_DECRYPT_LENGTH, + rc2_cbc_known_ciphertext, + FIPS_RC2_ENCRYPT_LENGTH ); + + RC2_DestroyContext( rc2_context, PR_TRUE ); + + if( ( rc2_status != SECSuccess ) || + ( rc2_bytes_decrypted != FIPS_RC2_DECRYPT_LENGTH ) || + ( PORT_Memcmp( rc2_computed_plaintext, rc2_ecb_known_plaintext, + FIPS_RC2_DECRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + + +static CK_RV +sftk_fips_RC4_PowerUpSelfTest( void ) +{ + /* RC4 Known Key (40-bits). */ + static const PRUint8 rc4_known_key[] = { "RSARC" }; + + /* RC4 Known Plaintext (64-bits). */ + static const PRUint8 rc4_known_plaintext[] = { "Netscape" }; + + /* RC4 Known Ciphertext (64-bits). */ + static const PRUint8 rc4_known_ciphertext[] = { + 0x29,0x33,0xc7,0x9a,0x9d,0x6c,0x09,0xdd}; + + /* RC4 variables. */ + PRUint8 rc4_computed_ciphertext[FIPS_RC4_ENCRYPT_LENGTH]; + PRUint8 rc4_computed_plaintext[FIPS_RC4_DECRYPT_LENGTH]; + RC4Context * rc4_context; + unsigned int rc4_bytes_encrypted; + unsigned int rc4_bytes_decrypted; + SECStatus rc4_status; + + + /**************************************************/ + /* RC4 Single-Round Known Answer Encryption Test: */ + /**************************************************/ + + rc4_context = RC4_CreateContext( rc4_known_key, FIPS_RC4_KEY_LENGTH ); + + if( rc4_context == NULL ) + return( CKR_HOST_MEMORY ); + + rc4_status = RC4_Encrypt( rc4_context, rc4_computed_ciphertext, + &rc4_bytes_encrypted, FIPS_RC4_ENCRYPT_LENGTH, + rc4_known_plaintext, FIPS_RC4_DECRYPT_LENGTH ); + + RC4_DestroyContext( rc4_context, PR_TRUE ); + + if( ( rc4_status != SECSuccess ) || + ( rc4_bytes_encrypted != FIPS_RC4_ENCRYPT_LENGTH ) || + ( PORT_Memcmp( rc4_computed_ciphertext, rc4_known_ciphertext, + FIPS_RC4_ENCRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /**************************************************/ + /* RC4 Single-Round Known Answer Decryption Test: */ + /**************************************************/ + + rc4_context = RC4_CreateContext( rc4_known_key, FIPS_RC4_KEY_LENGTH ); + + if( rc4_context == NULL ) + return( CKR_HOST_MEMORY ); + + rc4_status = RC4_Decrypt( rc4_context, rc4_computed_plaintext, + &rc4_bytes_decrypted, FIPS_RC4_DECRYPT_LENGTH, + rc4_known_ciphertext, FIPS_RC4_ENCRYPT_LENGTH ); + + RC4_DestroyContext( rc4_context, PR_TRUE ); + + if( ( rc4_status != SECSuccess ) || + ( rc4_bytes_decrypted != FIPS_RC4_DECRYPT_LENGTH ) || + ( PORT_Memcmp( rc4_computed_plaintext, rc4_known_plaintext, + FIPS_RC4_DECRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + + +static CK_RV +sftk_fips_DES_PowerUpSelfTest( void ) +{ + /* DES Known Key (56-bits). */ + static const PRUint8 des_known_key[] = { "ANSI DES" }; + + /* DES-CBC Known Initialization Vector (64-bits). */ + static const PRUint8 des_cbc_known_initialization_vector[] = { "Security" }; + + /* DES Known Plaintext (64-bits). */ + static const PRUint8 des_ecb_known_plaintext[] = { "Netscape" }; + static const PRUint8 des_cbc_known_plaintext[] = { "Netscape" }; + + /* DES Known Ciphertext (64-bits). */ + static const PRUint8 des_ecb_known_ciphertext[] = { + 0x26,0x14,0xe9,0xc3,0x28,0x80,0x50,0xb0}; + static const PRUint8 des_cbc_known_ciphertext[] = { + 0x5e,0x95,0x94,0x5d,0x76,0xa2,0xd3,0x7d}; + + /* DES variables. */ + PRUint8 des_computed_ciphertext[FIPS_DES_ENCRYPT_LENGTH]; + PRUint8 des_computed_plaintext[FIPS_DES_DECRYPT_LENGTH]; + DESContext * des_context; + unsigned int des_bytes_encrypted; + unsigned int des_bytes_decrypted; + SECStatus des_status; + + + /******************************************************/ + /* DES-ECB Single-Round Known Answer Encryption Test: */ + /******************************************************/ + + des_context = DES_CreateContext( des_known_key, NULL, NSS_DES, PR_TRUE ); + + if( des_context == NULL ) + return( CKR_HOST_MEMORY ); + + des_status = DES_Encrypt( des_context, des_computed_ciphertext, + &des_bytes_encrypted, FIPS_DES_ENCRYPT_LENGTH, + des_ecb_known_plaintext, + FIPS_DES_DECRYPT_LENGTH ); + + DES_DestroyContext( des_context, PR_TRUE ); + + if( ( des_status != SECSuccess ) || + ( des_bytes_encrypted != FIPS_DES_ENCRYPT_LENGTH ) || + ( PORT_Memcmp( des_computed_ciphertext, des_ecb_known_ciphertext, + FIPS_DES_ENCRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /******************************************************/ + /* DES-ECB Single-Round Known Answer Decryption Test: */ + /******************************************************/ + + des_context = DES_CreateContext( des_known_key, NULL, NSS_DES, PR_FALSE ); + + if( des_context == NULL ) + return( CKR_HOST_MEMORY ); + + des_status = DES_Decrypt( des_context, des_computed_plaintext, + &des_bytes_decrypted, FIPS_DES_DECRYPT_LENGTH, + des_ecb_known_ciphertext, + FIPS_DES_ENCRYPT_LENGTH ); + + DES_DestroyContext( des_context, PR_TRUE ); + + if( ( des_status != SECSuccess ) || + ( des_bytes_decrypted != FIPS_DES_DECRYPT_LENGTH ) || + ( PORT_Memcmp( des_computed_plaintext, des_ecb_known_plaintext, + FIPS_DES_DECRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /******************************************************/ + /* DES-CBC Single-Round Known Answer Encryption Test. */ + /******************************************************/ + + des_context = DES_CreateContext( des_known_key, + des_cbc_known_initialization_vector, + NSS_DES_CBC, PR_TRUE ); + + if( des_context == NULL ) + return( CKR_HOST_MEMORY ); + + des_status = DES_Encrypt( des_context, des_computed_ciphertext, + &des_bytes_encrypted, FIPS_DES_ENCRYPT_LENGTH, + des_cbc_known_plaintext, + FIPS_DES_DECRYPT_LENGTH ); + + DES_DestroyContext( des_context, PR_TRUE ); + + if( ( des_status != SECSuccess ) || + ( des_bytes_encrypted != FIPS_DES_ENCRYPT_LENGTH ) || + ( PORT_Memcmp( des_computed_ciphertext, des_cbc_known_ciphertext, + FIPS_DES_ENCRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /******************************************************/ + /* DES-CBC Single-Round Known Answer Decryption Test. */ + /******************************************************/ + + des_context = DES_CreateContext( des_known_key, + des_cbc_known_initialization_vector, + NSS_DES_CBC, PR_FALSE ); + + if( des_context == NULL ) + return( CKR_HOST_MEMORY ); + + des_status = DES_Decrypt( des_context, des_computed_plaintext, + &des_bytes_decrypted, FIPS_DES_DECRYPT_LENGTH, + des_cbc_known_ciphertext, + FIPS_DES_ENCRYPT_LENGTH ); + + DES_DestroyContext( des_context, PR_TRUE ); + + if( ( des_status != SECSuccess ) || + ( des_bytes_decrypted != FIPS_DES_DECRYPT_LENGTH ) || + ( PORT_Memcmp( des_computed_plaintext, des_cbc_known_plaintext, + FIPS_DES_DECRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + + +static CK_RV +sftk_fips_DES3_PowerUpSelfTest( void ) +{ + /* DES3 Known Key (56-bits). */ + static const PRUint8 des3_known_key[] = { "ANSI Triple-DES Key Data" }; + + /* DES3-CBC Known Initialization Vector (64-bits). */ + static const PRUint8 des3_cbc_known_initialization_vector[] = { "Security" }; + + /* DES3 Known Plaintext (64-bits). */ + static const PRUint8 des3_ecb_known_plaintext[] = { "Netscape" }; + static const PRUint8 des3_cbc_known_plaintext[] = { "Netscape" }; + + /* DES3 Known Ciphertext (64-bits). */ + static const PRUint8 des3_ecb_known_ciphertext[] = { + 0x55,0x8e,0xad,0x3c,0xee,0x49,0x69,0xbe}; + static const PRUint8 des3_cbc_known_ciphertext[] = { + 0x43,0xdc,0x6a,0xc1,0xaf,0xa6,0x32,0xf5}; + + /* DES3 variables. */ + PRUint8 des3_computed_ciphertext[FIPS_DES3_ENCRYPT_LENGTH]; + PRUint8 des3_computed_plaintext[FIPS_DES3_DECRYPT_LENGTH]; + DESContext * des3_context; + unsigned int des3_bytes_encrypted; + unsigned int des3_bytes_decrypted; + SECStatus des3_status; + + + /*******************************************************/ + /* DES3-ECB Single-Round Known Answer Encryption Test. */ + /*******************************************************/ + + des3_context = DES_CreateContext( des3_known_key, NULL, + NSS_DES_EDE3, PR_TRUE ); + + if( des3_context == NULL ) + return( CKR_HOST_MEMORY ); + + des3_status = DES_Encrypt( des3_context, des3_computed_ciphertext, + &des3_bytes_encrypted, FIPS_DES3_ENCRYPT_LENGTH, + des3_ecb_known_plaintext, + FIPS_DES3_DECRYPT_LENGTH ); + + DES_DestroyContext( des3_context, PR_TRUE ); + + if( ( des3_status != SECSuccess ) || + ( des3_bytes_encrypted != FIPS_DES3_ENCRYPT_LENGTH ) || + ( PORT_Memcmp( des3_computed_ciphertext, des3_ecb_known_ciphertext, + FIPS_DES3_ENCRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /*******************************************************/ + /* DES3-ECB Single-Round Known Answer Decryption Test. */ + /*******************************************************/ + + des3_context = DES_CreateContext( des3_known_key, NULL, + NSS_DES_EDE3, PR_FALSE ); + + if( des3_context == NULL ) + return( CKR_HOST_MEMORY ); + + des3_status = DES_Decrypt( des3_context, des3_computed_plaintext, + &des3_bytes_decrypted, FIPS_DES3_DECRYPT_LENGTH, + des3_ecb_known_ciphertext, + FIPS_DES3_ENCRYPT_LENGTH ); + + DES_DestroyContext( des3_context, PR_TRUE ); + + if( ( des3_status != SECSuccess ) || + ( des3_bytes_decrypted != FIPS_DES3_DECRYPT_LENGTH ) || + ( PORT_Memcmp( des3_computed_plaintext, des3_ecb_known_plaintext, + FIPS_DES3_DECRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /*******************************************************/ + /* DES3-CBC Single-Round Known Answer Encryption Test. */ + /*******************************************************/ + + des3_context = DES_CreateContext( des3_known_key, + des3_cbc_known_initialization_vector, + NSS_DES_EDE3_CBC, PR_TRUE ); + + if( des3_context == NULL ) + return( CKR_HOST_MEMORY ); + + des3_status = DES_Encrypt( des3_context, des3_computed_ciphertext, + &des3_bytes_encrypted, FIPS_DES3_ENCRYPT_LENGTH, + des3_cbc_known_plaintext, + FIPS_DES3_DECRYPT_LENGTH ); + + DES_DestroyContext( des3_context, PR_TRUE ); + + if( ( des3_status != SECSuccess ) || + ( des3_bytes_encrypted != FIPS_DES3_ENCRYPT_LENGTH ) || + ( PORT_Memcmp( des3_computed_ciphertext, des3_cbc_known_ciphertext, + FIPS_DES3_ENCRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /*******************************************************/ + /* DES3-CBC Single-Round Known Answer Decryption Test. */ + /*******************************************************/ + + des3_context = DES_CreateContext( des3_known_key, + des3_cbc_known_initialization_vector, + NSS_DES_EDE3_CBC, PR_FALSE ); + + if( des3_context == NULL ) + return( CKR_HOST_MEMORY ); + + des3_status = DES_Decrypt( des3_context, des3_computed_plaintext, + &des3_bytes_decrypted, FIPS_DES3_DECRYPT_LENGTH, + des3_cbc_known_ciphertext, + FIPS_DES3_ENCRYPT_LENGTH ); + + DES_DestroyContext( des3_context, PR_TRUE ); + + if( ( des3_status != SECSuccess ) || + ( des3_bytes_decrypted != FIPS_DES3_DECRYPT_LENGTH ) || + ( PORT_Memcmp( des3_computed_plaintext, des3_cbc_known_plaintext, + FIPS_DES3_DECRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + + +/* AES self-test for 128-bit, 192-bit, or 256-bit key sizes*/ +static CK_RV +sftk_fips_AES_PowerUpSelfTest( int aes_key_size ) +{ + /* AES Known Key (up to 256-bits). */ + static const PRUint8 aes_known_key[] = + { "AES-128 RIJNDAELLEADNJIR 821-SEA" }; + + /* AES-CBC Known Initialization Vector (128-bits). */ + static const PRUint8 aes_cbc_known_initialization_vector[] = + { "SecurityytiruceS" }; + + /* AES Known Plaintext (128-bits). (blocksize is 128-bits) */ + static const PRUint8 aes_known_plaintext[] = { "NetscapeepacsteN" }; + + /* AES Known Ciphertext (128-bit key). */ + static const PRUint8 aes_ecb128_known_ciphertext[] = { + 0x3c,0xa5,0x96,0xf3,0x34,0x6a,0x96,0xc1, + 0x03,0x88,0x16,0x7b,0x20,0xbf,0x35,0x47 }; + + static const PRUint8 aes_cbc128_known_ciphertext[] = { + 0xcf,0x15,0x1d,0x4f,0x96,0xe4,0x4f,0x63, + 0x15,0x54,0x14,0x1d,0x4e,0xd8,0xd5,0xea }; + + /* AES Known Ciphertext (192-bit key). */ + static const PRUint8 aes_ecb192_known_ciphertext[] = { + 0xa0,0x18,0x62,0xed,0x88,0x19,0xcb,0x62, + 0x88,0x1d,0x4d,0xfe,0x84,0x02,0x89,0x0e }; + + static const PRUint8 aes_cbc192_known_ciphertext[] = { + 0x83,0xf7,0xa4,0x76,0xd1,0x6f,0x07,0xbe, + 0x07,0xbc,0x43,0x2f,0x6d,0xad,0x29,0xe1 }; + + /* AES Known Ciphertext (256-bit key). */ + static const PRUint8 aes_ecb256_known_ciphertext[] = { + 0xdb,0xa6,0x52,0x01,0x8a,0x70,0xae,0x66, + 0x3a,0x99,0xd8,0x95,0x7f,0xfb,0x01,0x67 }; + + static const PRUint8 aes_cbc256_known_ciphertext[] = { + 0x37,0xea,0x07,0x06,0x31,0x1c,0x59,0x27, + 0xc5,0xc5,0x68,0x71,0x6e,0x34,0x40,0x16 }; + + const PRUint8 *aes_ecb_known_ciphertext = + ( aes_key_size == FIPS_AES_128_KEY_SIZE) ? aes_ecb128_known_ciphertext : + ( aes_key_size == FIPS_AES_192_KEY_SIZE) ? aes_ecb192_known_ciphertext : + aes_ecb256_known_ciphertext; + + const PRUint8 *aes_cbc_known_ciphertext = + ( aes_key_size == FIPS_AES_128_KEY_SIZE) ? aes_cbc128_known_ciphertext : + ( aes_key_size == FIPS_AES_192_KEY_SIZE) ? aes_cbc192_known_ciphertext : + aes_cbc256_known_ciphertext; + + /* AES variables. */ + PRUint8 aes_computed_ciphertext[FIPS_AES_ENCRYPT_LENGTH]; + PRUint8 aes_computed_plaintext[FIPS_AES_DECRYPT_LENGTH]; + AESContext * aes_context; + unsigned int aes_bytes_encrypted; + unsigned int aes_bytes_decrypted; + SECStatus aes_status; + + /*check if aes_key_size is 128, 192, or 256 bits */ + if ((aes_key_size != FIPS_AES_128_KEY_SIZE) && + (aes_key_size != FIPS_AES_192_KEY_SIZE) && + (aes_key_size != FIPS_AES_256_KEY_SIZE)) + return( CKR_DEVICE_ERROR ); + + /******************************************************/ + /* AES-ECB Single-Round Known Answer Encryption Test: */ + /******************************************************/ + + aes_context = AES_CreateContext( aes_known_key, NULL, NSS_AES, PR_TRUE, + aes_key_size, FIPS_AES_BLOCK_SIZE ); + + if( aes_context == NULL ) + return( CKR_HOST_MEMORY ); + + aes_status = AES_Encrypt( aes_context, aes_computed_ciphertext, + &aes_bytes_encrypted, FIPS_AES_ENCRYPT_LENGTH, + aes_known_plaintext, + FIPS_AES_DECRYPT_LENGTH ); + + AES_DestroyContext( aes_context, PR_TRUE ); + + if( ( aes_status != SECSuccess ) || + ( aes_bytes_encrypted != FIPS_AES_ENCRYPT_LENGTH ) || + ( PORT_Memcmp( aes_computed_ciphertext, aes_ecb_known_ciphertext, + FIPS_AES_ENCRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /******************************************************/ + /* AES-ECB Single-Round Known Answer Decryption Test: */ + /******************************************************/ + + aes_context = AES_CreateContext( aes_known_key, NULL, NSS_AES, PR_FALSE, + aes_key_size, FIPS_AES_BLOCK_SIZE ); + + if( aes_context == NULL ) + return( CKR_HOST_MEMORY ); + + aes_status = AES_Decrypt( aes_context, aes_computed_plaintext, + &aes_bytes_decrypted, FIPS_AES_DECRYPT_LENGTH, + aes_ecb_known_ciphertext, + FIPS_AES_ENCRYPT_LENGTH ); + + AES_DestroyContext( aes_context, PR_TRUE ); + + if( ( aes_status != SECSuccess ) || + ( aes_bytes_decrypted != FIPS_AES_DECRYPT_LENGTH ) || + ( PORT_Memcmp( aes_computed_plaintext, aes_known_plaintext, + FIPS_AES_DECRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /******************************************************/ + /* AES-CBC Single-Round Known Answer Encryption Test. */ + /******************************************************/ + + aes_context = AES_CreateContext( aes_known_key, + aes_cbc_known_initialization_vector, + NSS_AES_CBC, PR_TRUE, aes_key_size, + FIPS_AES_BLOCK_SIZE ); + + if( aes_context == NULL ) + return( CKR_HOST_MEMORY ); + + aes_status = AES_Encrypt( aes_context, aes_computed_ciphertext, + &aes_bytes_encrypted, FIPS_AES_ENCRYPT_LENGTH, + aes_known_plaintext, + FIPS_AES_DECRYPT_LENGTH ); + + AES_DestroyContext( aes_context, PR_TRUE ); + + if( ( aes_status != SECSuccess ) || + ( aes_bytes_encrypted != FIPS_AES_ENCRYPT_LENGTH ) || + ( PORT_Memcmp( aes_computed_ciphertext, aes_cbc_known_ciphertext, + FIPS_AES_ENCRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + + /******************************************************/ + /* AES-CBC Single-Round Known Answer Decryption Test. */ + /******************************************************/ + + aes_context = AES_CreateContext( aes_known_key, + aes_cbc_known_initialization_vector, + NSS_AES_CBC, PR_FALSE, aes_key_size, + FIPS_AES_BLOCK_SIZE ); + + if( aes_context == NULL ) + return( CKR_HOST_MEMORY ); + + aes_status = AES_Decrypt( aes_context, aes_computed_plaintext, + &aes_bytes_decrypted, FIPS_AES_DECRYPT_LENGTH, + aes_cbc_known_ciphertext, + FIPS_AES_ENCRYPT_LENGTH ); + + AES_DestroyContext( aes_context, PR_TRUE ); + + if( ( aes_status != SECSuccess ) || + ( aes_bytes_decrypted != FIPS_AES_DECRYPT_LENGTH ) || + ( PORT_Memcmp( aes_computed_plaintext, aes_known_plaintext, + FIPS_AES_DECRYPT_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + +/* Known Hash Message (512-bits). Used for all hashes (incl. SHA-N [N>1]). */ +static const PRUint8 known_hash_message[] = { + "The test message for the MD2, MD5, and SHA-1 hashing algorithms." }; + + +static CK_RV +sftk_fips_MD2_PowerUpSelfTest( void ) +{ + /* MD2 Known Digest Message (128-bits). */ + static const PRUint8 md2_known_digest[] = { + 0x41,0x5a,0x12,0xb2,0x3f,0x28,0x97,0x17, + 0x0c,0x71,0x4e,0xcc,0x40,0xc8,0x1d,0x1b}; + + /* MD2 variables. */ + MD2Context * md2_context; + unsigned int md2_bytes_hashed; + PRUint8 md2_computed_digest[MD2_LENGTH]; + + + /***********************************************/ + /* MD2 Single-Round Known Answer Hashing Test. */ + /***********************************************/ + + md2_context = MD2_NewContext(); + + if( md2_context == NULL ) + return( CKR_HOST_MEMORY ); + + MD2_Begin( md2_context ); + + MD2_Update( md2_context, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + MD2_End( md2_context, md2_computed_digest, &md2_bytes_hashed, MD2_LENGTH ); + + MD2_DestroyContext( md2_context , PR_TRUE ); + + if( ( md2_bytes_hashed != MD2_LENGTH ) || + ( PORT_Memcmp( md2_computed_digest, md2_known_digest, + MD2_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + + +static CK_RV +sftk_fips_MD5_PowerUpSelfTest( void ) +{ + /* MD5 Known Digest Message (128-bits). */ + static const PRUint8 md5_known_digest[] = { + 0x25,0xc8,0xc0,0x10,0xc5,0x6e,0x68,0x28, + 0x28,0xa4,0xa5,0xd2,0x98,0x9a,0xea,0x2d}; + + /* MD5 variables. */ + PRUint8 md5_computed_digest[MD5_LENGTH]; + SECStatus md5_status; + + + /***********************************************/ + /* MD5 Single-Round Known Answer Hashing Test. */ + /***********************************************/ + + md5_status = MD5_HashBuf( md5_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( md5_status != SECSuccess ) || + ( PORT_Memcmp( md5_computed_digest, md5_known_digest, + MD5_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + +/****************************************************/ +/* Single Round HMAC SHA-X test */ +/****************************************************/ +static SECStatus +sftk_fips_HMAC(unsigned char *hmac_computed, + const PRUint8 *secret_key, + unsigned int secret_key_length, + const PRUint8 *message, + unsigned int message_length, + HASH_HashType hashAlg ) +{ + SECStatus hmac_status = SECFailure; + HMACContext *cx = NULL; + SECHashObject *hashObj = NULL; + unsigned int bytes_hashed = 0; + + hashObj = (SECHashObject *) HASH_GetRawHashObject(hashAlg); + + if (!hashObj) + return( SECFailure ); + + cx = HMAC_Create(hashObj, secret_key, + secret_key_length, + PR_TRUE); /* PR_TRUE for in FIPS mode */ + + if (cx == NULL) + return( SECFailure ); + + HMAC_Begin(cx); + HMAC_Update(cx, message, message_length); + hmac_status = HMAC_Finish(cx, hmac_computed, &bytes_hashed, + hashObj->length); + + HMAC_Destroy(cx, PR_TRUE); + + return( hmac_status ); +} + +static CK_RV +sftk_fips_HMAC_PowerUpSelfTest( void ) +{ + static const PRUint8 HMAC_known_secret_key[] = { + "Firefox and ThunderBird are awesome!"}; + + static const PRUint8 HMAC_known_secret_key_length + = sizeof HMAC_known_secret_key; + + /* known SHA1 hmac (20 bytes) */ + static const PRUint8 known_SHA1_hmac[] = { + 0xd5, 0x85, 0xf6, 0x5b, 0x39, 0xfa, 0xb9, 0x05, + 0x3b, 0x57, 0x1d, 0x61, 0xe7, 0xb8, 0x84, 0x1e, + 0x5d, 0x0e, 0x1e, 0x11}; + + /* known SHA224 hmac (28 bytes) */ + static const PRUint8 known_SHA224_hmac[] = { + 0x1c, 0xc3, 0x06, 0x8e, 0xce, 0x37, 0x68, 0xfb, + 0x1a, 0x82, 0x4a, 0xbe, 0x2b, 0x00, 0x51, 0xf8, + 0x9d, 0xb6, 0xe0, 0x90, 0x0d, 0x00, 0xc9, 0x64, + 0x9a, 0xb8, 0x98, 0x4e}; + + /* known SHA256 hmac (32 bytes) */ + static const PRUint8 known_SHA256_hmac[] = { + 0x05, 0x75, 0x9a, 0x9e, 0x70, 0x5e, 0xe7, 0x44, + 0xe2, 0x46, 0x4b, 0x92, 0x22, 0x14, 0x22, 0xe0, + 0x1b, 0x92, 0x8a, 0x0c, 0xfe, 0xf5, 0x49, 0xe9, + 0xa7, 0x1b, 0x56, 0x7d, 0x1d, 0x29, 0x40, 0x48}; + + /* known SHA384 hmac (48 bytes) */ + static const PRUint8 known_SHA384_hmac[] = { + 0xcd, 0x56, 0x14, 0xec, 0x05, 0x53, 0x06, 0x2b, + 0x7e, 0x9c, 0x8a, 0x18, 0x5e, 0xea, 0xf3, 0x91, + 0x33, 0xfb, 0x64, 0xf6, 0xe3, 0x9f, 0x89, 0x0b, + 0xaf, 0xbe, 0x83, 0x4d, 0x3f, 0x3c, 0x43, 0x4d, + 0x4a, 0x0c, 0x56, 0x98, 0xf8, 0xca, 0xb4, 0xaa, + 0x9a, 0xf4, 0x0a, 0xaf, 0x4f, 0x69, 0xca, 0x87}; + + /* known SHA512 hmac (64 bytes) */ + static const PRUint8 known_SHA512_hmac[] = { + 0xf6, 0x0e, 0x97, 0x12, 0x00, 0x67, 0x6e, 0xb9, + 0x0c, 0xb2, 0x63, 0xf0, 0x60, 0xac, 0x75, 0x62, + 0x70, 0x95, 0x2a, 0x52, 0x22, 0xee, 0xdd, 0xd2, + 0x71, 0xb1, 0xe8, 0x26, 0x33, 0xd3, 0x13, 0x27, + 0xcb, 0xff, 0x44, 0xef, 0x87, 0x97, 0x16, 0xfb, + 0xd3, 0x0b, 0x48, 0xbe, 0x12, 0x4e, 0xda, 0xb1, + 0x89, 0x90, 0xfb, 0x06, 0x0c, 0xbe, 0xe5, 0xc4, + 0xff, 0x24, 0x37, 0x3d, 0xc7, 0xe4, 0xe4, 0x37}; + + SECStatus hmac_status; + PRUint8 hmac_computed[HASH_LENGTH_MAX]; + + /***************************************************/ + /* HMAC SHA-1 Single-Round Known Answer HMAC Test. */ + /***************************************************/ + + hmac_status = sftk_fips_HMAC(hmac_computed, + HMAC_known_secret_key, + HMAC_known_secret_key_length, + known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH, + HASH_AlgSHA1); + + if( ( hmac_status != SECSuccess ) || + ( PORT_Memcmp( hmac_computed, known_SHA1_hmac, + SHA1_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* HMAC SHA-224 Single-Round Known Answer Test. */ + /***************************************************/ + + hmac_status = sftk_fips_HMAC(hmac_computed, + HMAC_known_secret_key, + HMAC_known_secret_key_length, + known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH, + HASH_AlgSHA224); + + if( ( hmac_status != SECSuccess ) || + ( PORT_Memcmp( hmac_computed, known_SHA224_hmac, + SHA224_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* HMAC SHA-256 Single-Round Known Answer Test. */ + /***************************************************/ + + hmac_status = sftk_fips_HMAC(hmac_computed, + HMAC_known_secret_key, + HMAC_known_secret_key_length, + known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH, + HASH_AlgSHA256); + + if( ( hmac_status != SECSuccess ) || + ( PORT_Memcmp( hmac_computed, known_SHA256_hmac, + SHA256_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* HMAC SHA-384 Single-Round Known Answer Test. */ + /***************************************************/ + + hmac_status = sftk_fips_HMAC(hmac_computed, + HMAC_known_secret_key, + HMAC_known_secret_key_length, + known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH, + HASH_AlgSHA384); + + if( ( hmac_status != SECSuccess ) || + ( PORT_Memcmp( hmac_computed, known_SHA384_hmac, + SHA384_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* HMAC SHA-512 Single-Round Known Answer Test. */ + /***************************************************/ + + hmac_status = sftk_fips_HMAC(hmac_computed, + HMAC_known_secret_key, + HMAC_known_secret_key_length, + known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH, + HASH_AlgSHA512); + + if( ( hmac_status != SECSuccess ) || + ( PORT_Memcmp( hmac_computed, known_SHA512_hmac, + SHA512_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + +static CK_RV +sftk_fips_SHA_PowerUpSelfTest( void ) +{ + /* SHA-1 Known Digest Message (160-bits). */ + static const PRUint8 sha1_known_digest[] = { + 0x0a,0x6d,0x07,0xba,0x1e,0xbd,0x8a,0x1b, + 0x72,0xf6,0xc7,0x22,0xf1,0x27,0x9f,0xf0, + 0xe0,0x68,0x47,0x7a}; + + /* SHA-224 Known Digest Message (224-bits). */ + static const PRUint8 sha224_known_digest[] = { + 0x89,0x5e,0x7f,0xfd,0x0e,0xd8,0x35,0x6f, + 0x64,0x6d,0xf2,0xde,0x5e,0xed,0xa6,0x7f, + 0x29,0xd1,0x12,0x73,0x42,0x84,0x95,0x4f, + 0x8e,0x08,0xe5,0xcb}; + + /* SHA-256 Known Digest Message (256-bits). */ + static const PRUint8 sha256_known_digest[] = { + 0x38,0xa9,0xc1,0xf0,0x35,0xf6,0x5d,0x61, + 0x11,0xd4,0x0b,0xdc,0xce,0x35,0x14,0x8d, + 0xf2,0xdd,0xaf,0xaf,0xcf,0xb7,0x87,0xe9, + 0x96,0xa5,0xd2,0x83,0x62,0x46,0x56,0x79}; + + /* SHA-384 Known Digest Message (384-bits). */ + static const PRUint8 sha384_known_digest[] = { + 0x11,0xfe,0x1c,0x00,0x89,0x48,0xde,0xb3, + 0x99,0xee,0x1c,0x18,0xb4,0x10,0xfb,0xfe, + 0xe3,0xa8,0x2c,0xf3,0x04,0xb0,0x2f,0xc8, + 0xa3,0xc4,0x5e,0xea,0x7e,0x60,0x48,0x7b, + 0xce,0x2c,0x62,0xf7,0xbc,0xa7,0xe8,0xa3, + 0xcf,0x24,0xce,0x9c,0xe2,0x8b,0x09,0x72}; + + /* SHA-512 Known Digest Message (512-bits). */ + static const PRUint8 sha512_known_digest[] = { + 0xc8,0xb3,0x27,0xf9,0x0b,0x24,0xc8,0xbf, + 0x4c,0xba,0x33,0x54,0xf2,0x31,0xbf,0xdb, + 0xab,0xfd,0xb3,0x15,0xd7,0xfa,0x48,0x99, + 0x07,0x60,0x0f,0x57,0x41,0x1a,0xdd,0x28, + 0x12,0x55,0x25,0xac,0xba,0x3a,0x99,0x12, + 0x2c,0x7a,0x8f,0x75,0x3a,0xe1,0x06,0x6f, + 0x30,0x31,0xc9,0x33,0xc6,0x1b,0x90,0x1a, + 0x6c,0x98,0x9a,0x87,0xd0,0xb2,0xf8,0x07}; + + /* SHA-X variables. */ + PRUint8 sha_computed_digest[HASH_LENGTH_MAX]; + SECStatus sha_status; + + /*************************************************/ + /* SHA-1 Single-Round Known Answer Hashing Test. */ + /*************************************************/ + + sha_status = SHA1_HashBuf( sha_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( sha_status != SECSuccess ) || + ( PORT_Memcmp( sha_computed_digest, sha1_known_digest, + SHA1_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* SHA-224 Single-Round Known Answer Hashing Test. */ + /***************************************************/ + + sha_status = SHA224_HashBuf( sha_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( sha_status != SECSuccess ) || + ( PORT_Memcmp( sha_computed_digest, sha224_known_digest, + SHA224_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* SHA-256 Single-Round Known Answer Hashing Test. */ + /***************************************************/ + + sha_status = SHA256_HashBuf( sha_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( sha_status != SECSuccess ) || + ( PORT_Memcmp( sha_computed_digest, sha256_known_digest, + SHA256_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* SHA-384 Single-Round Known Answer Hashing Test. */ + /***************************************************/ + + sha_status = SHA384_HashBuf( sha_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( sha_status != SECSuccess ) || + ( PORT_Memcmp( sha_computed_digest, sha384_known_digest, + SHA384_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + /***************************************************/ + /* SHA-512 Single-Round Known Answer Hashing Test. */ + /***************************************************/ + + sha_status = SHA512_HashBuf( sha_computed_digest, known_hash_message, + FIPS_KNOWN_HASH_MESSAGE_LENGTH ); + + if( ( sha_status != SECSuccess ) || + ( PORT_Memcmp( sha_computed_digest, sha512_known_digest, + SHA512_LENGTH ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + /* -* Test the softoken RSA_HashSign and RSH_HashCheckSign. +* Single round RSA Signature Known Answer Test */ static SECStatus sftk_fips_RSA_PowerUpSigSelfTest (HASH_HashType shaAlg, @@ -180,7 +1155,7 @@ loser: } -static SECStatus +static CK_RV sftk_fips_RSA_PowerUpSelfTest( void ) { /* RSA Known Modulus used in both Public/Private Key Values (2048-bits). */ @@ -361,6 +1336,41 @@ sftk_fips_RSA_PowerUpSelfTest( void ) "blocks SHA256, SHA384 and " "SHA512 RSA Signature KAT tests."}; + /* RSA Known Ciphertext (2048-bits). */ + static const PRUint8 rsa_known_ciphertext[] = { + 0x04, 0x12, 0x46, 0xe3, 0x6a, 0xee, 0xde, 0xdd, + 0x49, 0xa1, 0xd9, 0x83, 0xf7, 0x35, 0xf9, 0x70, + 0x88, 0x03, 0x2d, 0x01, 0x8b, 0xd1, 0xbf, 0xdb, + 0xe5, 0x1c, 0x85, 0xbe, 0xb5, 0x0b, 0x48, 0x45, + 0x7a, 0xf0, 0xa0, 0xe3, 0xa2, 0xbb, 0x4b, 0xf6, + 0x27, 0xd0, 0x1b, 0x12, 0xe3, 0x77, 0x52, 0x34, + 0x9e, 0x8e, 0x03, 0xd2, 0xf8, 0x79, 0x6e, 0x39, + 0x79, 0x53, 0x3c, 0x44, 0x14, 0x94, 0xbb, 0x8d, + 0xaa, 0x14, 0x44, 0xa0, 0x7b, 0xa5, 0x8c, 0x93, + 0x5f, 0x99, 0xa4, 0xa3, 0x6e, 0x7a, 0x38, 0x40, + 0x78, 0xfa, 0x36, 0x91, 0x5e, 0x9a, 0x9c, 0xba, + 0x1e, 0xd4, 0xf9, 0xda, 0x4b, 0x0f, 0xa8, 0xa3, + 0x1c, 0xf3, 0x3a, 0xd1, 0xa5, 0xb4, 0x51, 0x16, + 0xed, 0x4b, 0xcf, 0xec, 0x93, 0x7b, 0x90, 0x21, + 0xbc, 0x3a, 0xf4, 0x0b, 0xd1, 0x3a, 0x2b, 0xba, + 0xa6, 0x7d, 0x5b, 0x53, 0xd8, 0x64, 0xf9, 0x29, + 0x7b, 0x7f, 0x77, 0x3e, 0x51, 0x4c, 0x9a, 0x94, + 0xd2, 0x4b, 0x4a, 0x8d, 0x61, 0x74, 0x97, 0xae, + 0x53, 0x6a, 0xf4, 0x90, 0xc2, 0x2c, 0x49, 0xe2, + 0xfa, 0xeb, 0x91, 0xc5, 0xe5, 0x83, 0x13, 0xc9, + 0x44, 0x4b, 0x95, 0x2c, 0x57, 0x70, 0x15, 0x5c, + 0x64, 0x8d, 0x1a, 0xfd, 0x2a, 0xc7, 0xb2, 0x9c, + 0x5c, 0x99, 0xd3, 0x4a, 0xfd, 0xdd, 0xf6, 0x82, + 0x87, 0x8c, 0x5a, 0xc4, 0xa8, 0x0d, 0x2a, 0xef, + 0xc3, 0xa2, 0x7e, 0x8e, 0x67, 0x9f, 0x6f, 0x63, + 0xdb, 0xbb, 0x1d, 0x31, 0xc4, 0xbb, 0xbc, 0x13, + 0x3f, 0x54, 0xc6, 0xf6, 0xc5, 0x28, 0x32, 0xab, + 0x96, 0x42, 0x10, 0x36, 0x40, 0x92, 0xbb, 0x57, + 0x55, 0x38, 0xf5, 0x43, 0x7e, 0x43, 0xc4, 0x65, + 0x47, 0x64, 0xaa, 0x0f, 0x4c, 0xe9, 0x49, 0x16, + 0xec, 0x6a, 0x50, 0xfd, 0x14, 0x49, 0xca, 0xdb, + 0x44, 0x54, 0xca, 0xbe, 0xa3, 0x0e, 0x5f, 0xef}; + /* RSA Known Signed Hash (2048-bits). */ static const PRUint8 rsa_known_sha256_signature[] = { 0x8c, 0x2d, 0x2e, 0xfb, 0x37, 0xb5, 0x6f, 0x38, @@ -504,6 +1514,8 @@ sftk_fips_RSA_PowerUpSelfTest( void ) NSSLOWKEYPublicKey low_public_key = { NULL, NSSLOWKEYRSAKey, }; NSSLOWKEYPrivateKey low_private_key = { NULL, NSSLOWKEYRSAKey, }; + PRUint8 rsa_computed_ciphertext[FIPS_RSA_ENCRYPT_LENGTH]; + PRUint8 rsa_computed_plaintext[FIPS_RSA_DECRYPT_LENGTH]; /****************************************/ /* Compose RSA Public/Private Key Pair. */ @@ -521,7 +1533,7 @@ sftk_fips_RSA_PowerUpSelfTest( void ) if( rsa_public_arena == NULL ) { PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); + return( CKR_HOST_MEMORY ); } /* Create some space for the RSA private key. */ @@ -530,7 +1542,7 @@ sftk_fips_RSA_PowerUpSelfTest( void ) if( rsa_private_arena == NULL ) { PORT_FreeArena( rsa_public_arena, PR_TRUE ); PORT_SetError( SEC_ERROR_NO_MEMORY ); - return( SECFailure ); + return( CKR_HOST_MEMORY ); } rsa_public_key->arena = rsa_public_arena; @@ -538,9 +1550,33 @@ sftk_fips_RSA_PowerUpSelfTest( void ) #endif /**************************************************/ - /* RSA Hash tests */ + /* RSA Single-Round Known Answer Encryption Test. */ /**************************************************/ + /* Perform RSA Public Key Encryption. */ + rsa_status = RSA_PublicKeyOp(&rsa_public_key->u.rsa, + rsa_computed_ciphertext, + rsa_known_plaintext_msg); + + if( ( rsa_status != SECSuccess ) || + ( PORT_Memcmp( rsa_computed_ciphertext, rsa_known_ciphertext, + FIPS_RSA_ENCRYPT_LENGTH ) != 0 ) ) + goto rsa_loser; + + /**************************************************/ + /* RSA Single-Round Known Answer Decryption Test. */ + /**************************************************/ + + /* Perform RSA Private Key Decryption. */ + rsa_status = RSA_PrivateKeyOp(&rsa_private_key->u.rsa, + rsa_computed_plaintext, + rsa_known_ciphertext); + + if( ( rsa_status != SECSuccess ) || + ( PORT_Memcmp( rsa_computed_plaintext, rsa_known_plaintext_msg, + FIPS_RSA_DECRYPT_LENGTH ) != 0 ) ) + goto rsa_loser; + rsa_status = sftk_fips_RSA_PowerUpSigSelfTest (HASH_AlgSHA256, rsa_public_key, rsa_private_key, rsa_known_plaintext_msg, FIPS_RSA_MESSAGE_LENGTH, @@ -566,88 +1602,499 @@ sftk_fips_RSA_PowerUpSelfTest( void ) nsslowkey_DestroyPublicKey( rsa_public_key ); nsslowkey_DestroyPrivateKey( rsa_private_key ); - return( SECSuccess ); + return( CKR_OK ); rsa_loser: nsslowkey_DestroyPublicKey( rsa_public_key ); nsslowkey_DestroyPrivateKey( rsa_private_key ); - PORT_SetError( SEC_ERROR_LIBRARY_FAILURE ); - return( SECFailure ); + return( CKR_DEVICE_ERROR ); } +#ifndef NSS_DISABLE_ECC -static PRBool sftk_self_tests_ran = PR_FALSE; -static PRBool sftk_self_tests_success = PR_FALSE; +static CK_RV +sftk_fips_ECDSA_Test(const PRUint8 *encodedParams, + unsigned int encodedParamsLen, + const PRUint8 *knownSignature, + unsigned int knownSignatureLen) { -/* - * This function is called at dll load time, the code tha makes this - * happen is platform specific on defined above. - */ -static void -sftk_startup_tests(void) -{ - SECStatus rv; - const char *libraryName = SOFTOKEN_LIB_NAME; - - PORT_Assert(!sftk_self_tests_ran); - PORT_Assert(!sftk_self_tests_success); - sftk_self_tests_ran = PR_TRUE; - sftk_self_tests_success = PR_FALSE; /* just in case */ - - /* need to initiallize the oid library before the RSA tests */ - rv = SECOID_Init(); - if (rv != SECSuccess) { - return; + /* ECDSA Known Seed info for curves nistp256 and nistk283 */ + static const PRUint8 ecdsa_Known_Seed[] = { + 0x6a, 0x9b, 0xf6, 0xf7, 0xce, 0xed, 0x79, 0x11, + 0xf0, 0xc7, 0xc8, 0x9a, 0xa5, 0xd1, 0x57, 0xb1, + 0x7b, 0x5a, 0x3b, 0x76, 0x4e, 0x7b, 0x7c, 0xbc, + 0xf2, 0x76, 0x1c, 0x1c, 0x7f, 0xc5, 0x53, 0x2f}; + + static const PRUint8 msg[] = { + "Firefox and ThunderBird are awesome!"}; + + unsigned char sha1[SHA1_LENGTH]; /* SHA-1 hash (160 bits) */ + unsigned char sig[2*MAX_ECKEY_LEN]; + SECItem signature, digest; + SECItem encodedparams; + ECParams *ecparams = NULL; + ECPrivateKey *ecdsa_private_key = NULL; + ECPublicKey ecdsa_public_key; + SECStatus ecdsaStatus = SECSuccess; + + /* construct the ECDSA private/public key pair */ + encodedparams.type = siBuffer; + encodedparams.data = (unsigned char *) encodedParams; + encodedparams.len = encodedParamsLen; + + if (EC_DecodeParams(&encodedparams, &ecparams) != SECSuccess) { + return( CKR_DEVICE_ERROR ); } - /* make sure freebl is initialized, or our RSA check - * may fail. This is normally done at freebl load time, but it's - * possible we may have shut freebl down without unloading it. */ - rv = BL_Init(); - if (rv != SECSuccess) { - return; + + /* Generates a new EC key pair. The private key is a supplied + * random value (in seed) and the public key is the result of + * performing a scalar point multiplication of that value with + * the curve's base point. + */ + ecdsaStatus = EC_NewKeyFromSeed(ecparams, &ecdsa_private_key, + ecdsa_Known_Seed, + sizeof(ecdsa_Known_Seed)); + /* free the ecparams they are no longer needed */ + PORT_FreeArena(ecparams->arena, PR_FALSE); + ecparams = NULL; + if (ecdsaStatus != SECSuccess) { + return ( CKR_DEVICE_ERROR ); } - rv = RNG_RNGInit(); - if (rv != SECSuccess) { - return; + /* construct public key from private key. */ + ecdsaStatus = EC_CopyParams(ecdsa_private_key->ecParams.arena, + &ecdsa_public_key.ecParams, + &ecdsa_private_key->ecParams); + if (ecdsaStatus != SECSuccess) { + goto loser; } - /* check the RSA combined functions in softoken */ - rv = sftk_fips_RSA_PowerUpSelfTest(); - if (rv !=SECSuccess) { - return; + ecdsa_public_key.publicValue = ecdsa_private_key->publicValue; + + /* validate public key value */ + ecdsaStatus = EC_ValidatePublicKey(&ecdsa_public_key.ecParams, + &ecdsa_public_key.publicValue); + if (ecdsaStatus != SECSuccess) { + goto loser; + } + + /* validate public key value */ + ecdsaStatus = EC_ValidatePublicKey(&ecdsa_private_key->ecParams, + &ecdsa_private_key->publicValue); + if (ecdsaStatus != SECSuccess) { + goto loser; + } + + /***************************************************/ + /* ECDSA Single-Round Known Answer Signature Test. */ + /***************************************************/ + + ecdsaStatus = SHA1_HashBuf(sha1, msg, sizeof msg); + if (ecdsaStatus != SECSuccess) { + goto loser; } - if (!BLAPI_SHVerify(libraryName, - (PRFuncPtr) &sftk_fips_RSA_PowerUpSelfTest)) { - /* something is wrong with the library, fail without enabling - * the token */ - return; + digest.type = siBuffer; + digest.data = sha1; + digest.len = SHA1_LENGTH; + + memset(sig, 0, sizeof sig); + signature.type = siBuffer; + signature.data = sig; + signature.len = sizeof sig; + + ecdsaStatus = ECDSA_SignDigestWithSeed(ecdsa_private_key, &signature, + &digest, ecdsa_Known_Seed, sizeof ecdsa_Known_Seed); + if (ecdsaStatus != SECSuccess) { + goto loser; } - sftk_self_tests_success = PR_TRUE; + + if( ( signature.len != knownSignatureLen ) || + ( PORT_Memcmp( signature.data, knownSignature, + knownSignatureLen ) != 0 ) ) { + ecdsaStatus = SECFailure; + goto loser; + } + + /******************************************************/ + /* ECDSA Single-Round Known Answer Verification Test. */ + /******************************************************/ + + /* Perform ECDSA verification process. */ + ecdsaStatus = ECDSA_VerifyDigest(&ecdsa_public_key, &signature, &digest); + +loser: + /* free the memory for the private key arena*/ + if (ecdsa_private_key != NULL) { + PORT_FreeArena(ecdsa_private_key->ecParams.arena, PR_FALSE); + } + + if (ecdsaStatus != SECSuccess) { + return CKR_DEVICE_ERROR ; + } + return( CKR_OK ); } +static CK_RV +sftk_fips_ECDSA_PowerUpSelfTest() { -/* - * this is called from nsc_Common_Initizialize entry points that gates access - * to * all other pkcs11 functions. This prevents softoken operation if our - * power on selftest failed. - */ -CK_RV -sftk_FIPSEntryOK() { -#ifdef NSS_NO_INIT_SUPPORT - /* this should only be set on platforms that can't handle one of the INIT - * schemes. This code allows those platforms to continue to function, - * though they don't meet the strict NIST requirements. If NSS_NO_INIT_SUPPORT - * is not set, and init support has not been properly enabled, softken - * will always fail because of the test below - */ - if (!sftk_self_tests_ran) { - sftk_startup_tests(); + /* ECDSA Known curve nistp256 == SEC_OID_SECG_EC_SECP256R1 params */ + static const PRUint8 ecdsa_known_P256_EncodedParams[] = { + 0x06,0x08,0x2a,0x86,0x48,0xce,0x3d,0x03, + 0x01,0x07}; + + static const PRUint8 ecdsa_known_P256_signature[] = { + 0x07,0xb1,0xcb,0x57,0x20,0xa7,0x10,0xd6, + 0x9d,0x37,0x4b,0x1c,0xdc,0x35,0x90,0xff, + 0x1a,0x2d,0x98,0x95,0x1b,0x2f,0xeb,0x7f, + 0xbb,0x81,0xca,0xc0,0x69,0x75,0xea,0xc5, + 0x59,0x6a,0x62,0x49,0x3d,0x50,0xc9,0xe1, + 0x27,0x3b,0xff,0x9b,0x13,0x66,0x67,0xdd, + 0x7d,0xd1,0x0d,0x2d,0x7c,0x44,0x04,0x1b, + 0x16,0x21,0x12,0xc5,0xcb,0xbd,0x9e,0x75}; + +#ifdef NSS_ECC_MORE_THAN_SUITE_B + /* ECDSA Known curve nistk283 == SEC_OID_SECG_EC_SECT283K1 params */ + static const PRUint8 ecdsa_known_K283_EncodedParams[] = { + 0x06,0x05,0x2b,0x81,0x04,0x00,0x10}; + + static const PRUint8 ecdsa_known_K283_signature[] = { + 0x00,0x45,0x88,0xc0,0x79,0x09,0x07,0xd1, + 0x4e,0x88,0xe6,0xd5,0x2f,0x22,0x04,0x74, + 0x35,0x24,0x65,0xe8,0x15,0xde,0x90,0x66, + 0x94,0x70,0xdd,0x3a,0x14,0x70,0x02,0xd1, + 0xef,0x86,0xbd,0x15,0x00,0xd9,0xdc,0xfc, + 0x87,0x2e,0x7c,0x99,0xe2,0xe3,0x79,0xb8, + 0xd9,0x10,0x49,0x78,0x4b,0x59,0x8b,0x05, + 0x77,0xec,0x6c,0xe8,0x35,0xe6,0x2e,0xa9, + 0xf9,0x77,0x1f,0x71,0x86,0xa5,0x4a,0xd0}; +#endif + + CK_RV crv; + + /* ECDSA GF(p) prime field curve test */ + crv = sftk_fips_ECDSA_Test(ecdsa_known_P256_EncodedParams, + sizeof ecdsa_known_P256_EncodedParams, + ecdsa_known_P256_signature, + sizeof ecdsa_known_P256_signature ); + if (crv != CKR_OK) { + return( CKR_DEVICE_ERROR ); + } + +#ifdef NSS_ECC_MORE_THAN_SUITE_B + /* ECDSA GF(2m) binary field curve test */ + crv = sftk_fips_ECDSA_Test(ecdsa_known_K283_EncodedParams, + sizeof ecdsa_known_K283_EncodedParams, + ecdsa_known_K283_signature, + sizeof ecdsa_known_K283_signature ); + if (crv != CKR_OK) { + return( CKR_DEVICE_ERROR ); } #endif - if (!sftk_self_tests_success) { - return CKR_DEVICE_ERROR; + + return( CKR_OK ); +} + +#endif /* NSS_DISABLE_ECC */ + +static CK_RV +sftk_fips_DSA_PowerUpSelfTest( void ) +{ + /* DSA Known P (1024-bits), Q (160-bits), and G (1024-bits) Values. */ + static const PRUint8 dsa_P[] = { + 0x80,0xb0,0xd1,0x9d,0x6e,0xa4,0xf3,0x28, + 0x9f,0x24,0xa9,0x8a,0x49,0xd0,0x0c,0x63, + 0xe8,0x59,0x04,0xf9,0x89,0x4a,0x5e,0xc0, + 0x6d,0xd2,0x67,0x6b,0x37,0x81,0x83,0x0c, + 0xfe,0x3a,0x8a,0xfd,0xa0,0x3b,0x08,0x91, + 0x1c,0xcb,0xb5,0x63,0xb0,0x1c,0x70,0xd0, + 0xae,0xe1,0x60,0x2e,0x12,0xeb,0x54,0xc7, + 0xcf,0xc6,0xcc,0xae,0x97,0x52,0x32,0x63, + 0xd3,0xeb,0x55,0xea,0x2f,0x4c,0xd5,0xd7, + 0x3f,0xda,0xec,0x49,0x27,0x0b,0x14,0x56, + 0xc5,0x09,0xbe,0x4d,0x09,0x15,0x75,0x2b, + 0xa3,0x42,0x0d,0x03,0x71,0xdf,0x0f,0xf4, + 0x0e,0xe9,0x0c,0x46,0x93,0x3d,0x3f,0xa6, + 0x6c,0xdb,0xca,0xe5,0xac,0x96,0xc8,0x64, + 0x5c,0xec,0x4b,0x35,0x65,0xfc,0xfb,0x5a, + 0x1b,0x04,0x1b,0xa1,0x0e,0xfd,0x88,0x15}; + + static const PRUint8 dsa_Q[] = { + 0xad,0x22,0x59,0xdf,0xe5,0xec,0x4c,0x6e, + 0xf9,0x43,0xf0,0x4b,0x2d,0x50,0x51,0xc6, + 0x91,0x99,0x8b,0xcf}; + + static const PRUint8 dsa_G[] = { + 0x78,0x6e,0xa9,0xd8,0xcd,0x4a,0x85,0xa4, + 0x45,0xb6,0x6e,0x5d,0x21,0x50,0x61,0xf6, + 0x5f,0xdf,0x5c,0x7a,0xde,0x0d,0x19,0xd3, + 0xc1,0x3b,0x14,0xcc,0x8e,0xed,0xdb,0x17, + 0xb6,0xca,0xba,0x86,0xa9,0xea,0x51,0x2d, + 0xc1,0xa9,0x16,0xda,0xf8,0x7b,0x59,0x8a, + 0xdf,0xcb,0xa4,0x67,0x00,0x44,0xea,0x24, + 0x73,0xe5,0xcb,0x4b,0xaf,0x2a,0x31,0x25, + 0x22,0x28,0x3f,0x16,0x10,0x82,0xf7,0xeb, + 0x94,0x0d,0xdd,0x09,0x22,0x14,0x08,0x79, + 0xba,0x11,0x0b,0xf1,0xff,0x2d,0x67,0xac, + 0xeb,0xb6,0x55,0x51,0x69,0x97,0xa7,0x25, + 0x6b,0x9c,0xa0,0x9b,0xd5,0x08,0x9b,0x27, + 0x42,0x1c,0x7a,0x69,0x57,0xe6,0x2e,0xed, + 0xa9,0x5b,0x25,0xe8,0x1f,0xd2,0xed,0x1f, + 0xdf,0xe7,0x80,0x17,0xba,0x0d,0x4d,0x38}; + + /* DSA Known Random Values (known random key block is 160-bits) */ + /* and (known random signature block is 160-bits). */ + static const PRUint8 dsa_known_random_key_block[] = { + "Mozilla Rules World!"}; + static const PRUint8 dsa_known_random_signature_block[] = { + "Random DSA Signature"}; + + /* DSA Known Digest (160-bits) */ + static const PRUint8 dsa_known_digest[] = { "DSA Signature Digest" }; + + /* DSA Known Signature (320-bits). */ + static const PRUint8 dsa_known_signature[] = { + 0x25,0x7c,0x3a,0x79,0x32,0x45,0xb7,0x32, + 0x70,0xca,0x62,0x63,0x2b,0xf6,0x29,0x2c, + 0x22,0x2a,0x03,0xce,0x48,0x15,0x11,0x72, + 0x7b,0x7e,0xf5,0x7a,0xf3,0x10,0x3b,0xde, + 0x34,0xc1,0x9e,0xd7,0x27,0x9e,0x77,0x38}; + + /* DSA variables. */ + DSAPrivateKey * dsa_private_key; + SECStatus dsa_status; + SECItem dsa_signature_item; + SECItem dsa_digest_item; + DSAPublicKey dsa_public_key; + PRUint8 dsa_computed_signature[FIPS_DSA_SIGNATURE_LENGTH]; + static const PQGParams dsa_pqg = { NULL, + { FIPS_DSA_TYPE, (unsigned char *)dsa_P, FIPS_DSA_PRIME_LENGTH }, + { FIPS_DSA_TYPE, (unsigned char *)dsa_Q, FIPS_DSA_SUBPRIME_LENGTH }, + { FIPS_DSA_TYPE, (unsigned char *)dsa_G, FIPS_DSA_BASE_LENGTH }}; + + /*******************************************/ + /* Generate a DSA public/private key pair. */ + /*******************************************/ + + /* Generate a DSA public/private key pair. */ + dsa_status = DSA_NewKeyFromSeed(&dsa_pqg, dsa_known_random_key_block, + &dsa_private_key); + + if( dsa_status != SECSuccess ) + return( CKR_HOST_MEMORY ); + + /* construct public key from private key. */ + dsa_public_key.params = dsa_private_key->params; + dsa_public_key.publicValue = dsa_private_key->publicValue; + + /*************************************************/ + /* DSA Single-Round Known Answer Signature Test. */ + /*************************************************/ + + dsa_signature_item.data = dsa_computed_signature; + dsa_signature_item.len = sizeof dsa_computed_signature; + + dsa_digest_item.data = (unsigned char *)dsa_known_digest; + dsa_digest_item.len = SHA1_LENGTH; + + /* Perform DSA signature process. */ + dsa_status = DSA_SignDigestWithSeed( dsa_private_key, + &dsa_signature_item, + &dsa_digest_item, + dsa_known_random_signature_block ); + + if( ( dsa_status != SECSuccess ) || + ( dsa_signature_item.len != FIPS_DSA_SIGNATURE_LENGTH ) || + ( PORT_Memcmp( dsa_computed_signature, dsa_known_signature, + FIPS_DSA_SIGNATURE_LENGTH ) != 0 ) ) { + dsa_status = SECFailure; + } else { + + /****************************************************/ + /* DSA Single-Round Known Answer Verification Test. */ + /****************************************************/ + + /* Perform DSA verification process. */ + dsa_status = DSA_VerifyDigest( &dsa_public_key, + &dsa_signature_item, + &dsa_digest_item); } - return CKR_OK; - } + + PORT_FreeArena(dsa_private_key->params.arena, PR_TRUE); + /* Don't free public key, it uses same arena as private key */ + + /* Verify DSA signature. */ + if( dsa_status != SECSuccess ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); + + +} + +static CK_RV +sftk_fips_RNG_PowerUpSelfTest( void ) +{ + static const PRUint8 Q[] = { + 0x85,0x89,0x9c,0x77,0xa3,0x79,0xff,0x1a, + 0x86,0x6f,0x2f,0x3e,0x2e,0xf9,0x8c,0x9c, + 0x9d,0xef,0xeb,0xed}; + static const PRUint8 GENX[] = { + 0x65,0x48,0xe3,0xca,0xac,0x64,0x2d,0xf7, + 0x7b,0xd3,0x4e,0x79,0xc9,0x7d,0xa6,0xa8, + 0xa2,0xc2,0x1f,0x8f,0xe9,0xb9,0xd3,0xa1, + 0x3f,0xf7,0x0c,0xcd,0xa6,0xca,0xbf,0xce, + 0x84,0x0e,0xb6,0xf1,0x0d,0xbe,0xa9,0xa3}; + static const PRUint8 rng_known_DSAX[] = { + 0x7a,0x86,0xf1,0x7f,0xbd,0x4e,0x6e,0xd9, + 0x0a,0x26,0x21,0xd0,0x19,0xcb,0x86,0x73, + 0x10,0x1f,0x60,0xd7}; + + + + SECStatus rng_status = SECSuccess; + PRUint8 DSAX[FIPS_DSA_SUBPRIME_LENGTH]; + + /*******************************************/ + /* Run the SP 800-90 Health tests */ + /*******************************************/ + rng_status = PRNGTEST_RunHealthTests(); + if (rng_status != SECSuccess) { + return (CKR_DEVICE_ERROR); + } + + /*******************************************/ + /* Generate DSAX fow given Q. */ + /*******************************************/ + + rng_status = FIPS186Change_ReduceModQForDSA(GENX, Q, DSAX); + + /* Verify DSAX to perform the RNG integrity check */ + if( ( rng_status != SECSuccess ) || + ( PORT_Memcmp( DSAX, rng_known_DSAX, + (FIPS_DSA_SUBPRIME_LENGTH) ) != 0 ) ) + return( CKR_DEVICE_ERROR ); + + return( CKR_OK ); +} + +static CK_RV +sftk_fipsSoftwareIntegrityTest(void) +{ + CK_RV crv = CKR_OK; + + /* make sure that our check file signatures are OK */ + if( !BLAPI_VerifySelf( NULL ) || + !BLAPI_SHVerify( SOFTOKEN_LIB_NAME, (PRFuncPtr) sftk_fips_HMAC ) ) { + crv = CKR_DEVICE_ERROR; /* better error code? checksum error? */ + } + return crv; +} + +CK_RV +sftk_fipsPowerUpSelfTest( void ) +{ + CK_RV rv; + + /* RC2 Power-Up SelfTest(s). */ + rv = sftk_fips_RC2_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* RC4 Power-Up SelfTest(s). */ + rv = sftk_fips_RC4_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* DES Power-Up SelfTest(s). */ + rv = sftk_fips_DES_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* DES3 Power-Up SelfTest(s). */ + rv = sftk_fips_DES3_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* AES Power-Up SelfTest(s) for 128-bit key. */ + rv = sftk_fips_AES_PowerUpSelfTest(FIPS_AES_128_KEY_SIZE); + + if( rv != CKR_OK ) + return rv; + + /* AES Power-Up SelfTest(s) for 192-bit key. */ + rv = sftk_fips_AES_PowerUpSelfTest(FIPS_AES_192_KEY_SIZE); + + if( rv != CKR_OK ) + return rv; + + /* AES Power-Up SelfTest(s) for 256-bit key. */ + rv = sftk_fips_AES_PowerUpSelfTest(FIPS_AES_256_KEY_SIZE); + + if( rv != CKR_OK ) + return rv; + + /* MD2 Power-Up SelfTest(s). */ + rv = sftk_fips_MD2_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* MD5 Power-Up SelfTest(s). */ + rv = sftk_fips_MD5_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* SHA-X Power-Up SelfTest(s). */ + rv = sftk_fips_SHA_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* HMAC SHA-X Power-Up SelfTest(s). */ + rv = sftk_fips_HMAC_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* RSA Power-Up SelfTest(s). */ + rv = sftk_fips_RSA_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* DSA Power-Up SelfTest(s). */ + rv = sftk_fips_DSA_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + + /* RNG Power-Up SelfTest(s). */ + rv = sftk_fips_RNG_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; + +#ifndef NSS_DISABLE_ECC + /* ECDSA Power-Up SelfTest(s). */ + rv = sftk_fips_ECDSA_PowerUpSelfTest(); + + if( rv != CKR_OK ) + return rv; +#endif + + /* Software/Firmware Integrity Test. */ + rv = sftk_fipsSoftwareIntegrityTest(); + + if( rv != CKR_OK ) + return rv; + + /* Passed Power-Up SelfTest(s). */ + return( CKR_OK ); +} + diff --git a/lib/softoken/fipstokn.c b/lib/softoken/fipstokn.c index 3d9156d5e..3cb6b794d 100644 --- a/lib/softoken/fipstokn.c +++ b/lib/softoken/fipstokn.c @@ -92,7 +92,6 @@ libaudit_init(void) * ******************** Password Utilities ******************************* */ static PRBool isLoggedIn = PR_FALSE; -static PRBool isLevel2 = PR_TRUE; PRBool sftk_fatalError = PR_FALSE; /* @@ -193,7 +192,7 @@ static CK_RV sftk_newPinCheck(CK_CHAR_PTR pPin, CK_ULONG ulPinLen) { static CK_RV sftk_fipsCheck(void) { if (sftk_fatalError) return CKR_DEVICE_ERROR; - if (isLevel2 && !isLoggedIn) + if (!isLoggedIn) return CKR_USER_NOT_LOGGED_IN; return CKR_OK; } @@ -426,44 +425,21 @@ CK_RV FC_GetFunctionList(CK_FUNCTION_LIST_PTR *pFunctionList) { /* sigh global so pkcs11 can read it */ PRBool nsf_init = PR_FALSE; -void fc_log_init_error(CK_RV crv) { - if (sftk_audit_enabled) { - char msg[128]; - PR_snprintf(msg,sizeof msg, - "C_Initialize()=0x%08lX " - "power-up self-tests failed", - (PRUint32)crv); - sftk_LogAuditMessage(NSS_AUDIT_ERROR, NSS_AUDIT_SELF_TEST, msg); - } -} - - /* FC_Initialize initializes the PKCS #11 library. */ CK_RV FC_Initialize(CK_VOID_PTR pReserved) { const char *envp; CK_RV crv; - if ((envp = PR_GetEnv("NSS_ENABLE_AUDIT")) != NULL) { - sftk_audit_enabled = (atoi(envp) == 1); - } - - /* At this point we should have already done post and integrity checks. - * if we haven't, it probably means the FIPS product has not been installed - * or the tests failed. Don't let an application try to enter FIPS mode */ - crv = sftk_FIPSEntryOK(); - if (crv != CKR_OK) { - sftk_fatalError = PR_TRUE; - fc_log_init_error(crv); - return crv; - } - - sftk_ForkReset(pReserved, &crv); if (nsf_init) { return CKR_CRYPTOKI_ALREADY_INITIALIZED; } + if ((envp = PR_GetEnv("NSS_ENABLE_AUDIT")) != NULL) { + sftk_audit_enabled = (atoi(envp) == 1); + } + crv = nsc_CommonInitialize(pReserved, PR_TRUE); /* not an 'else' rv can be set by either SFTK_LowInit or SFTK_SlotInit*/ @@ -473,8 +449,22 @@ CK_RV FC_Initialize(CK_VOID_PTR pReserved) { } sftk_fatalError = PR_FALSE; /* any error has been reset */ + + crv = sftk_fipsPowerUpSelfTest(); + if (crv != CKR_OK) { + nsc_CommonFinalize(NULL, PR_TRUE); + sftk_fatalError = PR_TRUE; + if (sftk_audit_enabled) { + char msg[128]; + PR_snprintf(msg,sizeof msg, + "C_Initialize()=0x%08lX " + "power-up self-tests failed", + (PRUint32)crv); + sftk_LogAuditMessage(NSS_AUDIT_ERROR, NSS_AUDIT_SELF_TEST, msg); + } + return crv; + } nsf_init = PR_TRUE; - isLevel2 = PR_TRUE; /* assume level 2 unless we learn otherwise */ return CKR_OK; } @@ -529,11 +519,8 @@ CK_RV FC_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo) { CHECK_FORK(); crv = NSC_GetTokenInfo(slotID,pInfo); - if (crv == CKR_OK) { - if ((pInfo->flags & CKF_LOGIN_REQUIRED) == 0) { - isLevel2 = PR_FALSE; - } - } + if (crv == CKR_OK) + pInfo->flags |= CKF_LOGIN_REQUIRED; return crv; } @@ -546,10 +533,8 @@ CK_RV FC_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo) { CHECK_FORK(); SFTK_FIPSFATALCHECK(); - if ((slotID == FIPS_SLOT_ID) || (slotID >=SFTK_MIN_FIPS_USER_SLOT_ID)) { - slotID = NETSCAPE_SLOT_ID; - } - /* FIPS Slots support all functions */ + if (slotID == FIPS_SLOT_ID) slotID = NETSCAPE_SLOT_ID; + /* FIPS Slot supports all functions */ return NSC_GetMechanismList(slotID,pMechanismList,pusCount); } @@ -561,10 +546,8 @@ CK_RV FC_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo) { CHECK_FORK(); SFTK_FIPSFATALCHECK(); - if ((slotID == FIPS_SLOT_ID) || (slotID >=SFTK_MIN_FIPS_USER_SLOT_ID)) { - slotID = NETSCAPE_SLOT_ID; - } - /* FIPS Slots support all functions */ + if (slotID == FIPS_SLOT_ID) slotID = NETSCAPE_SLOT_ID; + /* FIPS Slot supports all functions */ return NSC_GetMechanismInfo(slotID,type,pInfo); } @@ -599,14 +582,8 @@ CK_RV FC_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo) { CHECK_FORK(); if (sftk_fatalError) return CKR_DEVICE_ERROR; - /* NSC_InitPIN will only work once per database. We can either initialize - * it to level1 (pin len == 0) or level2. If we initialize to level 2, then - * we need to make sure the pin meets FIPS requirements */ - if ((ulPinLen== 0) || ((rv = sftk_newPinCheck(pPin,ulPinLen)) == CKR_OK)) { + if ((rv = sftk_newPinCheck(pPin,ulPinLen)) == CKR_OK) { rv = NSC_InitPIN(hSession,pPin,ulPinLen); - if (rv == CKR_OK) { - isLevel2 = (ulPinLen > 0) ? PR_TRUE : PR_FALSE; - } } if (sftk_audit_enabled) { char msg[128]; @@ -632,12 +609,6 @@ CK_RV FC_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo) { if ((rv = sftk_fipsCheck()) == CKR_OK && (rv = sftk_newPinCheck(pNewPin,usNewLen)) == CKR_OK) { rv = NSC_SetPIN(hSession,pOldPin,usOldLen,pNewPin,usNewLen); - if (rv == CKR_OK) { - /* if we set the password in level1 we now go - * to level2. NOTE: we don't allow the user to - * go from level2 to level1 */ - isLevel2 = PR_TRUE; - } } if (sftk_audit_enabled) { char msg[128]; diff --git a/lib/softoken/legacydb/lgdb.h b/lib/softoken/legacydb/lgdb.h index 2b914cc47..c67bffa5e 100644 --- a/lib/softoken/legacydb/lgdb.h +++ b/lib/softoken/legacydb/lgdb.h @@ -67,9 +67,6 @@ NSSLOWKEYDBHandle *lg_getKeyDB(SDB *sdb); const char *lg_EvaluateConfigDir(const char *configdir, char **domain); -/* verify the FIPS selftests ran and were successful */ -PRBool lg_FIPSEntryOK(void); - /* * object handle modifiers diff --git a/lib/softoken/legacydb/lgfips.c b/lib/softoken/legacydb/lgfips.c deleted file mode 100644 index 1e4c40c95..000000000 --- a/lib/softoken/legacydb/lgfips.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * PKCS #11 FIPS Power-Up Self Test. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* $Id: fipstest.c,v 1.31 2012/06/28 17:55:06 rrelyea%redhat.com Exp $ */ - -#include "seccomon.h" -#include "lgdb.h" -#include "blapi.h" - -/* - * different platforms have different ways of calling and initial entry point - * when the dll/.so is loaded. Most platforms support either a posix pragma - * or the GCC attribute. Some platforms suppor a pre-defined name, and some - * platforms have a link line way of invoking this function. - */ -#ifndef NSS_NO_INIT_SUPPORT -/* The pragma */ -#if defined(USE_INIT_PRAGMA) -#pragma init(lg_startup_tests) -#endif - - -/* GCC Attribute */ -#ifdef __GNUC__ -#define INIT_FUNCTION __attribute__((constructor)) -#else -#define INIT_FUNCTION -#endif - -static void INIT_FUNCTION lg_startup_tests(void); - -/* Windows pre-defined entry */ -#ifdef XP_WIN -#include <windows.h> -#include <primpl.h> - -BOOL WINAPI DllMain( - HINSTANCE hinstDLL, // handle to DLL module - DWORD fdwReason, // reason for calling function - LPVOID lpReserved ) // reserved -{ - // Perform actions based on the reason for calling. - switch( fdwReason ) - { - case DLL_PROCESS_ATTACH: - // Initialize once for each new process. - // Return FALSE to fail DLL load. - lg_startup_tests(); - break; - - case DLL_THREAD_ATTACH: - // Do thread-specific initialization. - break; - - case DLL_THREAD_DETACH: - // Do thread-specific cleanup. - break; - - case DLL_PROCESS_DETACH: - // Perform any necessary cleanup. - break; - } - return TRUE; // Successful DLL_PROCESS_ATTACH. -} -#endif -#endif /* !NSS_NO_INIT_SUPPORT */ - -static PRBool lg_self_tests_ran = PR_FALSE; -static PRBool lg_self_tests_success = PR_FALSE; - -static void -lg_local_function(void) {} - -/* - * This function is called at dll load time, the code tha makes this - * happen is platform specific on defined above. - */ -static void -lg_startup_tests(void) -{ - const char *libraryName = LG_LIB_NAME; - - PORT_Assert(!lg_self_tests_ran); - PORT_Assert(!lg_self_tests_success); - lg_self_tests_ran = PR_TRUE; - lg_self_tests_success = PR_FALSE; /* just in case */ - - /* no self tests required for the legacy db, only the integrity check */ - /* check the integrity of our shared library */ - if (!BLAPI_SHVerify(libraryName, (PRFuncPtr) &lg_local_function)) { - /* something is wrong with the library, fail without enabling - * the fips token */ - return; - } - /* FIPS product has been installed and is functioning, allow - * the module to operate in fips mode */ - lg_self_tests_success = PR_TRUE; -} - -PRBool -lg_FIPSEntryOK() { -#ifdef NSS_NO_INIT_SUPPORT - /* this should only be set on platforms that can't handle one of the INIT - * schemes. This code allows those platforms to continue to function, - * though they don't meet the strict NIST requirements. - * If NSS_NO_INIT_SUPPORT is not set, and init support has not been - * properly enabled, softken will always fail because of the test below */ - if (!lg_self_tests_ran) { - lg_startup_tests(); - } -#endif - return lg_self_tests_success; -} - diff --git a/lib/softoken/legacydb/lginit.c b/lib/softoken/legacydb/lginit.c index 23cfca957..b2ff521a5 100644 --- a/lib/softoken/legacydb/lginit.c +++ b/lib/softoken/legacydb/lginit.c @@ -499,7 +499,6 @@ lg_init(SDB **pSdb, int flags, NSSLOWCERTCertDBHandle *certdbPtr, LGPrivate *lgdb_p = NULL; CK_RV error = CKR_HOST_MEMORY; - *pSdb = NULL; sdb = (SDB *) PORT_Alloc(sizeof(SDB)); if (sdb == NULL) { @@ -524,6 +523,7 @@ lg_init(SDB **pSdb, int flags, NSSLOWCERTCertDBHandle *certdbPtr, sdb->private = lgdb_p; sdb->version = 0; + /*sdb->sdb_type = SDB_LEGACY; */ sdb->sdb_flags = flags; sdb->app_private = NULL; sdb->sdb_FindObjectsInit = lg_FindObjectsInit; @@ -586,17 +586,11 @@ legacy_Open(const char *configdir, const char *certPrefix, { CK_RV crv = CKR_OK; SECStatus rv; - PRBool readOnly = ((flags & 0x7) == SDB_RDONLY)? PR_TRUE: PR_FALSE; + PRBool readOnly = (flags == SDB_RDONLY)? PR_TRUE: PR_FALSE; #define NSS_VERSION_VARIABLE __nss_dbm_version #include "verref.h" - if (flags & SDB_FIPS) { - if (!lg_FIPSEntryOK()) { - return CKR_DEVICE_ERROR; - } - } - rv = SECOID_Init(); if (SECSuccess != rv) { return CKR_DEVICE_ERROR; diff --git a/lib/softoken/legacydb/manifest.mn b/lib/softoken/legacydb/manifest.mn index e60147269..b0d3eef92 100644 --- a/lib/softoken/legacydb/manifest.mn +++ b/lib/softoken/legacydb/manifest.mn @@ -12,7 +12,7 @@ LIBRARY_NAME = nssdbm LIBRARY_VERSION = 3 MAPFILE = $(OBJDIR)/nssdbm.def -DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DLG_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" +DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" CSRCS = \ dbmshim.c \ @@ -21,7 +21,6 @@ CSRCS = \ lgcreate.c \ lgdestroy.c \ lgfind.c \ - lgfips.c \ lginit.c \ lgutil.c \ lowcert.c \ diff --git a/lib/softoken/lgglue.c b/lib/softoken/lgglue.c index 1f6a4f56e..05bd82524 100644 --- a/lib/softoken/lgglue.c +++ b/lib/softoken/lgglue.c @@ -246,14 +246,29 @@ static const char *LEGACY_LIB_NAME = * 2 bools to tell us if we've check the legacy library successfully or * not. Initialize on startup to false by the C BSS segment; */ +static PRBool legacy_glue_libCheckFailed; /* set if we failed the check */ +static PRBool legacy_glue_libCheckSucceeded; /* set if we passed the check */ static PRLibrary *legacy_glue_lib = NULL; static SECStatus -sftkdbLoad_Legacy() +sftkdbLoad_Legacy(PRBool isFIPS) { PRLibrary *lib = NULL; LGSetCryptFunc setCryptFunction = NULL; if (legacy_glue_lib) { + /* this check is necessary because it's possible we loaded the + * legacydb to read secmod.db, which told us whether we were in + * FIPS mode or not. */ + if (isFIPS && !legacy_glue_libCheckSucceeded) { + if (legacy_glue_libCheckFailed || + !BLAPI_SHVerify(LEGACY_LIB_NAME,(PRFuncPtr)legacy_glue_open)) { + legacy_glue_libCheckFailed = PR_TRUE; + /* don't clobber legacy glue to avoid race. just let it + * get cleared in shutdown */ + return SECFailure; + } + legacy_glue_libCheckSucceeded = PR_TRUE; + } return SECSuccess; } @@ -283,6 +298,15 @@ sftkdbLoad_Legacy() return SECFailure; } + /* verify the loaded library if we are in FIPS mode */ + if (isFIPS) { + if (!BLAPI_SHVerify(LEGACY_LIB_NAME,(PRFuncPtr)legacy_glue_open)) { + PR_UnloadLibrary(lib); + return SECFailure; + } + legacy_glue_libCheckSucceeded = PR_TRUE; + } + setCryptFunction(sftkdb_encrypt_stub,sftkdb_decrypt_stub); legacy_glue_lib = lib; return SECSuccess; @@ -290,12 +314,12 @@ sftkdbLoad_Legacy() CK_RV sftkdbCall_open(const char *dir, const char *certPrefix, const char *keyPrefix, - int certVersion, int keyVersion, int flags, + int certVersion, int keyVersion, int flags, PRBool isFIPS, SDB **certDB, SDB **keyDB) { SECStatus rv; - rv = sftkdbLoad_Legacy(); + rv = sftkdbLoad_Legacy(isFIPS); if (rv != SECSuccess) { return CKR_GENERAL_ERROR; } @@ -404,6 +428,8 @@ sftkdbCall_Shutdown(void) legacy_glue_releaseSecmod = NULL; legacy_glue_deleteSecmod = NULL; legacy_glue_addSecmod = NULL; + legacy_glue_libCheckFailed = PR_FALSE; + legacy_glue_libCheckSucceeded = PR_FALSE; return crv; } diff --git a/lib/softoken/lgglue.h b/lib/softoken/lgglue.h index 829b11bff..b87f7567e 100644 --- a/lib/softoken/lgglue.h +++ b/lib/softoken/lgglue.h @@ -43,7 +43,7 @@ typedef void (*LGSetCryptFunc)(LGEncryptFunc, LGDecryptFunc); */ CK_RV sftkdbCall_open(const char *dir, const char *certPrefix, const char *keyPrefix, - int certVersion, int keyVersion, int flags, + int certVersion, int keyVersion, int flags, PRBool isFIPS, SDB **certDB, SDB **keyDB); char ** sftkdbCall_ReadSecmodDB(const char *appName, const char *filename, const char *dbname, char *params, PRBool rw); diff --git a/lib/softoken/pkcs11.c b/lib/softoken/pkcs11.c index 10ada6e8e..24bfaca1a 100644 --- a/lib/softoken/pkcs11.c +++ b/lib/softoken/pkcs11.c @@ -2452,12 +2452,7 @@ SFTK_SlotReInit(SFTKSlot *slot, char *configdir, char *updatedir, if ((slot->minimumPinLen == 0) && (params->pwRequired)) { slot->minimumPinLen = 1; } - /* Make sure the pin len is set to the Minimum allowed value for fips - * when in FIPS mode. NOTE: we don't set it if the database has not - * been initialized yet so that we can init into level1 mode if needed - */ - if ((sftkdb_HasPasswordSet(slot->keyDB) == SECSuccess) && - (moduleIndex == NSC_FIPS_MODULE) && + if ((moduleIndex == NSC_FIPS_MODULE) && (slot->minimumPinLen < FIPS_MIN_PIN)) { slot->minimumPinLen = FIPS_MIN_PIN; } @@ -3588,14 +3583,6 @@ CK_RV NSC_InitPIN(CK_SESSION_HANDLE hSession, /* Now update our local copy of the pin */ if (rv == SECSuccess) { if (ulPinLen == 0) slot->needLogin = PR_FALSE; - /* database has been initialized, now force min password in FIPS - * mode. NOTE: if we are in level1, we may not have a password, but - * forcing it now will prevent an insufficient password from being set. - */ - if ((sftk_GetModuleIndex(slot->slotID) == NSC_FIPS_MODULE) && - (slot->minimumPinLen < FIPS_MIN_PIN)) { - slot->minimumPinLen = FIPS_MIN_PIN; - } return CKR_OK; } crv = CKR_PIN_INCORRECT; diff --git a/lib/softoken/pkcs11c.c b/lib/softoken/pkcs11c.c index 8d8ec9921..5592294eb 100644 --- a/lib/softoken/pkcs11c.c +++ b/lib/softoken/pkcs11c.c @@ -1057,10 +1057,10 @@ finish_des: context->destroy = (SFTKDestroy) AES_DestroyContext; break; - case CKM_NSS_AES_KEY_WRAP_PAD: + case CKM_NETSCAPE_AES_KEY_WRAP_PAD: context->doPad = PR_TRUE; /* fall thru */ - case CKM_NSS_AES_KEY_WRAP: + case CKM_NETSCAPE_AES_KEY_WRAP: context->multi = PR_FALSE; context->blockSize = 8; if (key_type != CKK_AES) { @@ -3518,17 +3518,10 @@ nsc_parameter_gen(CK_KEY_TYPE key_type, SFTKObject *key) attribute = sftk_FindAttribute(key, CKA_PRIME_BITS); if (attribute == NULL) { - attribute =sftk_FindAttribute(key, CKA_PRIME); - if (attribute == NULL) { - return CKR_TEMPLATE_INCOMPLETE; - } else { - primeBits = attribute->attrib.ulValueLen; - sftk_FreeAttribute(attribute); - } - } else { - primeBits = (unsigned int) *(CK_ULONG *)attribute->attrib.pValue; - sftk_FreeAttribute(attribute); + return CKR_TEMPLATE_INCOMPLETE; } + primeBits = (unsigned int) *(CK_ULONG *)attribute->attrib.pValue; + sftk_FreeAttribute(attribute); if (primeBits < 1024) { j = PQG_PBITS_TO_INDEX(primeBits); if (j == (unsigned int)-1) { @@ -3536,7 +3529,7 @@ nsc_parameter_gen(CK_KEY_TYPE key_type, SFTKObject *key) } } - attribute = sftk_FindAttribute(key, CKA_NSS_PQG_SEED_BITS); + attribute = sftk_FindAttribute(key, CKA_NETSCAPE_PQG_SEED_BITS); if (attribute != NULL) { seedBits = (unsigned int) *(CK_ULONG *)attribute->attrib.pValue; sftk_FreeAttribute(attribute); @@ -3548,61 +3541,9 @@ nsc_parameter_gen(CK_KEY_TYPE key_type, SFTKObject *key) sftk_FreeAttribute(attribute); } - /* if P and Q are supplied, we want to generate a new G */ - attribute = sftk_FindAttribute(key, CKA_PRIME); - if (attribute != NULL) { - PLArenaPool *arena; - - sftk_FreeAttribute(attribute); - arena = PORT_NewArena(1024); - if (arena == NULL) { - crv = CKR_HOST_MEMORY; - goto loser; - } - params = PORT_ArenaAlloc(arena, sizeof(*params)); - if (params == NULL) { - crv = CKR_HOST_MEMORY; - goto loser; - } - params->arena = arena; - crv = sftk_Attribute2SSecItem(arena, ¶ms->prime, key, CKA_PRIME); - if (crv != CKR_OK) { - goto loser; - } - crv = sftk_Attribute2SSecItem(arena, ¶ms->subPrime, - key, CKA_SUBPRIME); - if (crv != CKR_OK) { - goto loser; - } - - arena = PORT_NewArena(1024); - if (arena == NULL) { - crv = CKR_HOST_MEMORY; - goto loser; - } - vfy = PORT_ArenaAlloc(arena, sizeof(*vfy)); - if (vfy == NULL) { - crv = CKR_HOST_MEMORY; - goto loser; - } - vfy->arena = arena; - crv = sftk_Attribute2SSecItem(arena, &vfy->seed, key, CKA_NSS_PQG_SEED); - if (crv != CKR_OK) { - goto loser; - } - crv = sftk_Attribute2SSecItem(arena, &vfy->h, key, CKA_NSS_PQG_H); - if (crv != CKR_OK) { - goto loser; - } - sftk_DeleteAttributeType(key,CKA_PRIME); - sftk_DeleteAttributeType(key,CKA_SUBPRIME); - sftk_DeleteAttributeType(key,CKA_NSS_PQG_SEED); - sftk_DeleteAttributeType(key,CKA_NSS_PQG_H); - } - sftk_DeleteAttributeType(key,CKA_PRIME_BITS); sftk_DeleteAttributeType(key,CKA_SUBPRIME_BITS); - sftk_DeleteAttributeType(key,CKA_NSS_PQG_SEED_BITS); + sftk_DeleteAttributeType(key,CKA_NETSCAPE_PQG_SEED_BITS); /* use the old PQG interface if we have old input data */ if ((primeBits < 1024) || ((primeBits == 1024) && (subprimeBits == 0))) { @@ -3639,19 +3580,17 @@ nsc_parameter_gen(CK_KEY_TYPE key_type, SFTKObject *key) params->base.data, params->base.len); if (crv != CKR_OK) goto loser; counter = vfy->counter; - crv = sftk_AddAttributeType(key,CKA_NSS_PQG_COUNTER, + crv = sftk_AddAttributeType(key,CKA_NETSCAPE_PQG_COUNTER, &counter, sizeof(counter)); - crv = sftk_AddAttributeType(key,CKA_NSS_PQG_SEED, + crv = sftk_AddAttributeType(key,CKA_NETSCAPE_PQG_SEED, vfy->seed.data, vfy->seed.len); if (crv != CKR_OK) goto loser; - crv = sftk_AddAttributeType(key,CKA_NSS_PQG_H, + crv = sftk_AddAttributeType(key,CKA_NETSCAPE_PQG_H, vfy->h.data, vfy->h.len); if (crv != CKR_OK) goto loser; loser: - if (params) { - PQG_DestroyParams(params); - } + PQG_DestroyParams(params); if (vfy) { PQG_DestroyVerify(vfy); diff --git a/lib/softoken/sdb.c b/lib/softoken/sdb.c index 76dd0fa64..16848604c 100644 --- a/lib/softoken/sdb.c +++ b/lib/softoken/sdb.c @@ -1694,7 +1694,7 @@ static const char INIT_CMD[] = CK_RV sdb_init(char *dbname, char *table, sdbDataType type, int *inUpdate, - int *newInit, int inFlags, PRUint32 accessOps, SDB **pSdb) + int *newInit, int flags, PRUint32 accessOps, SDB **pSdb) { int i; char *initStr = NULL; @@ -1710,7 +1710,6 @@ sdb_init(char *dbname, char *table, sdbDataType type, int *inUpdate, char *env; PRBool enableCache = PR_FALSE; PRBool create; - int flags = inFlags & 0x7; *pSdb = NULL; *inUpdate = 0; @@ -1926,7 +1925,7 @@ sdb_init(char *dbname, char *table, sdbDataType type, int *inUpdate, sdb_p->sqlXactThread = NULL; sdb->private = sdb_p; sdb->version = 0; - sdb->sdb_flags = inFlags | SDB_HAS_META; + sdb->sdb_flags = flags | SDB_HAS_META; sdb->app_private = NULL; sdb->sdb_FindObjectsInit = sdb_FindObjectsInit; sdb->sdb_FindObjects = sdb_FindObjects; diff --git a/lib/softoken/sdb.h b/lib/softoken/sdb.h index 14a708d88..2a855fb26 100644 --- a/lib/softoken/sdb.h +++ b/lib/softoken/sdb.h @@ -74,6 +74,5 @@ CK_RV s_shutdown(); #define SDB_RDWR 2 #define SDB_CREATE 4 #define SDB_HAS_META 8 -#define SDB_FIPS 0x10 #endif diff --git a/lib/softoken/sftkdb.c b/lib/softoken/sftkdb.c index 3e2c79172..61f1e9e4f 100644 --- a/lib/softoken/sftkdb.c +++ b/lib/softoken/sftkdb.c @@ -2581,9 +2581,6 @@ sftk_DBInit(const char *configdir, const char *certPrefix, if (!readOnly) { flags = SDB_CREATE; } - if (isFIPS) { - flags |= SDB_FIPS; - } *certDB = NULL; *keyDB = NULL; @@ -2599,11 +2596,11 @@ sftk_DBInit(const char *configdir, const char *certPrefix, switch (dbType) { case NSS_DB_TYPE_LEGACY: crv = sftkdbCall_open(confdir, certPrefix, keyPrefix, 8, 3, flags, - noCertDB? NULL : &certSDB, noKeyDB ? NULL: &keySDB); + isFIPS, noCertDB? NULL : &certSDB, noKeyDB ? NULL: &keySDB); break; case NSS_DB_TYPE_MULTIACCESS: crv = sftkdbCall_open(configdir, certPrefix, keyPrefix, 8, 3, flags, - noCertDB? NULL : &certSDB, noKeyDB ? NULL: &keySDB); + isFIPS, noCertDB? NULL : &certSDB, noKeyDB ? NULL: &keySDB); break; case NSS_DB_TYPE_SQL: case NSS_DB_TYPE_EXTERN: /* SHOULD open a loadable db */ @@ -2615,12 +2612,12 @@ sftk_DBInit(const char *configdir, const char *certPrefix, * the exists. */ if (crv != CKR_OK) { - if (((flags & SDB_RDONLY) == SDB_RDONLY) && + if ((flags == SDB_RDONLY) && sftk_hasLegacyDB(confdir, certPrefix, keyPrefix, 8, 3)) { /* we have legacy databases, if we failed to open the new format * DB's read only, just use the legacy ones */ crv = sftkdbCall_open(confdir, certPrefix, - keyPrefix, 8, 3, flags, + keyPrefix, 8, 3, flags, isFIPS, noCertDB? NULL : &certSDB, noKeyDB ? NULL : &keySDB); } /* Handle the database merge case. @@ -2691,7 +2688,7 @@ sftk_DBInit(const char *configdir, const char *certPrefix, CK_RV crv2; crv2 = sftkdbCall_open(confdir, certPrefix, keyPrefix, 8, 3, flags, - noCertDB ? NULL : &updateCert, + isFIPS, noCertDB ? NULL : &updateCert, noKeyDB ? NULL : &updateKey); if (crv2 == CKR_OK) { if (*certDB) { diff --git a/lib/softoken/softoken.h b/lib/softoken/softoken.h index 2ba0fcd63..fbd00b6c7 100644 --- a/lib/softoken/softoken.h +++ b/lib/softoken/softoken.h @@ -55,10 +55,10 @@ extern unsigned char * CBC_PadBuffer(PLArenaPool *arena, unsigned char *inbuf, /****************************************/ /* -** Power-Up selftests are required for FIPS. +** Power-Up selftests required for FIPS and invoked only +** under PKCS #11 FIPS mode. */ -/* make sure Power-up selftests have been run. */ -extern CK_RV sftk_FIPSEntryOK( void ); +extern CK_RV sftk_fipsPowerUpSelfTest( void ); /* ** make known fixed PKCS #11 key types to their sizes in bytes diff --git a/lib/util/pkcs11t.h b/lib/util/pkcs11t.h index e1df2d21d..23931413e 100644 --- a/lib/util/pkcs11t.h +++ b/lib/util/pkcs11t.h @@ -829,7 +829,6 @@ typedef CK_ULONG CK_MECHANISM_TYPE; #define CKM_TLS12_KEY_AND_MAC_DERIVE 0x000003E1 #define CKM_TLS12_MASTER_KEY_DERIVE_DH 0x000003E2 #define CKM_TLS12_KEY_SAFE_DERIVE 0x000003E3 -#define CKM_TLS12_MAC 0x000003E4 #define CKM_TLS_MAC 0x000003E4 #define CKM_TLS_KDF 0x000003E5 diff --git a/tests/common/Makefile b/tests/common/Makefile index 7faa677d2..5356356a6 100644 --- a/tests/common/Makefile +++ b/tests/common/Makefile @@ -19,6 +19,3 @@ dll_prefix: dll_suffix: @echo $(DLL_SUFFIX) - -freebl_lowhash: - @echo $(FREEBL_LOWHASH) |