diff options
| author | Robert Relyea <rrelyea@redhat.com> | 2015-08-31 14:34:18 -0700 |
|---|---|---|
| committer | Robert Relyea <rrelyea@redhat.com> | 2015-08-31 14:34:18 -0700 |
| commit | 7adc9ed826ee4e1a5174b4b1d3f1f2ebf381ffb2 (patch) | |
| tree | eb018f83be021da1799d6c492617959538d0230c /lib/softoken/softoken.h | |
| parent | 5aeac8e0722ed2a5fd9cbb849579fbb70dfeebc3 (diff) | |
| download | nss-hg-7adc9ed826ee4e1a5174b4b1d3f1f2ebf381ffb2.tar.gz | |
Pick up FIPS-140 certification work.
This consists of the following:
1)Move FIPS integrity and post tests to dll load time.
2) Extra data clearing of CPS, change to the prime check requirements.
3) Allow FIPS level 1. This is detected by whether or not there is a password on the database.
4) Update fipstest to handle new tests and the latest formats used by NIST. Also make running of the tests automated.
bob
Diffstat (limited to 'lib/softoken/softoken.h')
| -rw-r--r-- | lib/softoken/softoken.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/softoken/softoken.h b/lib/softoken/softoken.h index fbd00b6c7..2ba0fcd63 100644 --- a/lib/softoken/softoken.h +++ b/lib/softoken/softoken.h @@ -55,10 +55,10 @@ extern unsigned char * CBC_PadBuffer(PLArenaPool *arena, unsigned char *inbuf, /****************************************/ /* -** Power-Up selftests required for FIPS and invoked only -** under PKCS #11 FIPS mode. +** Power-Up selftests are required for FIPS. */ -extern CK_RV sftk_fipsPowerUpSelfTest( void ); +/* make sure Power-up selftests have been run. */ +extern CK_RV sftk_FIPSEntryOK( void ); /* ** make known fixed PKCS #11 key types to their sizes in bytes |