diff options
| author | kaie%kuix.de <devnull@localhost> | 2013-02-06 21:50:06 +0000 |
|---|---|---|
| committer | kaie%kuix.de <devnull@localhost> | 2013-02-06 21:50:06 +0000 |
| commit | fe4302ce9c8e29cf7eb618804c0267e99ce2017b (patch) | |
| tree | ccbc3b2497c599cc7ee6e94ba3d95a4285a2c9cc | |
| parent | 5788f1eadadb285c05d2e129dbd24e645ecbf742 (diff) | |
| download | nss-hg-fe4302ce9c8e29cf7eb618804c0267e99ce2017b.tar.gz | |
Bug 822365, Fix ppc64 endianness bug, patch by wtc, r=kaie
| -rw-r--r-- | security/nss/lib/softoken/pkcs11c.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/security/nss/lib/softoken/pkcs11c.c b/security/nss/lib/softoken/pkcs11c.c index 666fbfcb1..7ea6b0e5b 100644 --- a/security/nss/lib/softoken/pkcs11c.c +++ b/security/nss/lib/softoken/pkcs11c.c @@ -1594,12 +1594,12 @@ sftk_doHMACInit(SFTKSessionContext *context,HASH_HashType hash, context->end = (SFTKEnd) HMAC_Finish; context->hashdestroy = (SFTKDestroy) HMAC_Destroy; - intpointer = (CK_ULONG *) PORT_Alloc(sizeof(CK_ULONG)); + intpointer = PORT_New(CK_ULONG); if (intpointer == NULL) { return CKR_HOST_MEMORY; } *intpointer = mac_size; - context->cipherInfo = (void *) intpointer; + context->cipherInfo = intpointer; context->destroy = (SFTKDestroy) sftk_Space; context->update = (SFTKCipher) sftk_SignCopy; context->verify = (SFTKVerify) sftk_HMACCmp; @@ -2250,13 +2250,13 @@ finish_rsa: case CKM_NSS_HMAC_CONSTANT_TIME: { sftk_MACConstantTimeCtx *ctx = sftk_HMACConstantTime_New(pMechanism,key); - int *intpointer; + CK_ULONG *intpointer; if (ctx == NULL) { crv = CKR_ARGUMENTS_BAD; break; } - intpointer = PORT_Alloc(sizeof(int)); + intpointer = PORT_New(CK_ULONG); if (intpointer == NULL) { crv = CKR_HOST_MEMORY; break; @@ -2264,7 +2264,7 @@ finish_rsa: *intpointer = ctx->hash->length; context->cipherInfo = intpointer; - context->hashInfo = (void *) ctx; + context->hashInfo = ctx; context->currentMech = pMechanism->mechanism; context->hashUpdate = sftk_HMACConstantTime_Update; context->hashdestroy = sftk_MACConstantTime_DestroyContext; @@ -2280,13 +2280,13 @@ finish_rsa: case CKM_NSS_SSLV3_MAC_CONSTANT_TIME: { sftk_MACConstantTimeCtx *ctx = sftk_SSLv3MACConstantTime_New(pMechanism,key); - int *intpointer; + CK_ULONG *intpointer; if (ctx == NULL) { crv = CKR_ARGUMENTS_BAD; break; } - intpointer = PORT_Alloc(sizeof(int)); + intpointer = PORT_New(CK_ULONG); if (intpointer == NULL) { crv = CKR_HOST_MEMORY; break; @@ -2294,7 +2294,7 @@ finish_rsa: *intpointer = ctx->hash->length; context->cipherInfo = intpointer; - context->hashInfo = (void *) ctx; + context->hashInfo = ctx; context->currentMech = pMechanism->mechanism; context->hashUpdate = sftk_SSLv3MACConstantTime_Update; context->hashdestroy = sftk_MACConstantTime_DestroyContext; |