diff options
author | Robert Relyea <rrelyea@redhat.com> | 2015-09-04 17:41:15 -0700 |
---|---|---|
committer | Robert Relyea <rrelyea@redhat.com> | 2015-09-04 17:41:15 -0700 |
commit | e37c4156778f5153861aef23c324e146cf559e7e (patch) | |
tree | f1335a52a7da5e1372b0212d9473762c74777b39 /lib/freebl | |
parent | d76b343596b43d7e684853dc1eadf8ca657dfdb9 (diff) | |
download | nss-hg-e37c4156778f5153861aef23c324e146cf559e7e.tar.gz |
back out FIPS changes
Diffstat (limited to 'lib/freebl')
-rw-r--r-- | lib/freebl/Makefile | 37 | ||||
-rw-r--r-- | lib/freebl/blapii.h | 3 | ||||
-rw-r--r-- | lib/freebl/blname.c | 98 | ||||
-rw-r--r-- | lib/freebl/ctr.c | 17 | ||||
-rw-r--r-- | lib/freebl/ctr.h | 2 | ||||
-rw-r--r-- | lib/freebl/cts.c | 6 | ||||
-rw-r--r-- | lib/freebl/dh.c | 29 | ||||
-rw-r--r-- | lib/freebl/drbg.c | 31 | ||||
-rw-r--r-- | lib/freebl/ec.c | 4 | ||||
-rw-r--r-- | lib/freebl/fipsfreebl.c | 1775 | ||||
-rw-r--r-- | lib/freebl/freebl_hash_vector.def | 34 | ||||
-rw-r--r-- | lib/freebl/gcm.c | 23 | ||||
-rw-r--r-- | lib/freebl/ldvector.c | 43 | ||||
-rw-r--r-- | lib/freebl/loader.c | 94 | ||||
-rw-r--r-- | lib/freebl/loader.h | 36 | ||||
-rw-r--r-- | lib/freebl/lowhash_vector.c | 217 | ||||
-rw-r--r-- | lib/freebl/manifest.mn | 32 | ||||
-rw-r--r-- | lib/freebl/mpi/mpprime.c | 31 | ||||
-rw-r--r-- | lib/freebl/nsslowhash.c | 267 | ||||
-rw-r--r-- | lib/freebl/pqg.c | 46 | ||||
-rw-r--r-- | lib/freebl/rijndael.c | 18 | ||||
-rw-r--r-- | lib/freebl/rijndael.h | 1 | ||||
-rw-r--r-- | lib/freebl/rsa.c | 56 | ||||
-rw-r--r-- | lib/freebl/shvfy.c | 29 | ||||
-rw-r--r-- | lib/freebl/stubs.c | 26 | ||||
-rw-r--r-- | lib/freebl/stubs.h | 1 |
26 files changed, 396 insertions, 2560 deletions
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 |