diff options
| author | wtc%google.com <devnull@localhost> | 2011-03-29 15:12:45 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2011-03-29 15:12:45 +0000 |
| commit | 696241dd94f7650e3b25f41a38e73e9db0d1cff3 (patch) | |
| tree | 1c4be73005429e1c7e4a7406b16424a5481ad940 /security/nss/lib | |
| parent | 246607987b88c8de376dd1fa6a71659d9bace747 (diff) | |
| download | nss-hg-696241dd94f7650e3b25f41a38e73e9db0d1cff3.tar.gz | |
Bug 356713: fix formatting nits. Add back a cast (to cast away the const)
that was removed accidentally.
Modified Files:
mozilla/security/nss/lib/softoken/fipstest.c
mozilla/security/nss/lib/freebl/loader.h
mozilla/security/nss/lib/cryptohi/secsign.c
Diffstat (limited to 'security/nss/lib')
| -rw-r--r-- | security/nss/lib/cryptohi/secsign.c | 2 | ||||
| -rw-r--r-- | security/nss/lib/freebl/loader.h | 1 | ||||
| -rw-r--r-- | security/nss/lib/softoken/fipstest.c | 9 |
3 files changed, 6 insertions, 6 deletions
diff --git a/security/nss/lib/cryptohi/secsign.c b/security/nss/lib/cryptohi/secsign.c index 447084352..bdc4d186e 100644 --- a/security/nss/lib/cryptohi/secsign.c +++ b/security/nss/lib/cryptohi/secsign.c @@ -377,7 +377,7 @@ SEC_DerSignData(PRArenaPool *arena, SECItem *result, /* Fill out SignedData object */ PORT_Memset(&sd, 0, sizeof(sd)); - sd.data.data = buf; + sd.data.data = (unsigned char*) buf; sd.data.len = len; sd.signature.data = it.data; sd.signature.len = it.len << 3; /* convert to bit string */ diff --git a/security/nss/lib/freebl/loader.h b/security/nss/lib/freebl/loader.h index b9e1a144f..b30aa87f5 100644 --- a/security/nss/lib/freebl/loader.h +++ b/security/nss/lib/freebl/loader.h @@ -597,6 +597,7 @@ struct FREEBLVectorStr { SHA224Context * (* p_SHA224_Resurrect)(unsigned char *space, void *arg); void (* p_SHA224_Clone)(SHA224Context *dest, SHA224Context *src); PRBool (*p_BLAPI_SHVerifyFile)(const char *name); + /* Version 3.013 came to here */ }; diff --git a/security/nss/lib/softoken/fipstest.c b/security/nss/lib/softoken/fipstest.c index 807110de1..ca92cfeac 100644 --- a/security/nss/lib/softoken/fipstest.c +++ b/security/nss/lib/softoken/fipstest.c @@ -870,7 +870,7 @@ sftk_fips_HMAC_PowerUpSelfTest( void ) 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 }; + 0x9a, 0xb8, 0x98, 0x4e}; /* known SHA256 hmac (32 bytes) */ static const PRUint8 known_SHA256_hmac[] = { @@ -999,8 +999,7 @@ sftk_fips_SHA_PowerUpSelfTest( void ) 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 - }; + 0x8e,0x08,0xe5,0xcb}; /* SHA-256 Known Digest Message (256-bits). */ static const PRUint8 sha256_known_digest[] = { @@ -1053,8 +1052,8 @@ sftk_fips_SHA_PowerUpSelfTest( void ) FIPS_KNOWN_HASH_MESSAGE_LENGTH ); if( ( sha_status != SECSuccess ) || - ( PORT_Memcmp( sha_computed_digest, sha224_known_digest, - SHA224_LENGTH ) != 0 ) ) + ( PORT_Memcmp( sha_computed_digest, sha224_known_digest, + SHA224_LENGTH ) != 0 ) ) return( CKR_DEVICE_ERROR ); /***************************************************/ |