PK11_DecryptWithSymKey and PK11_EncryptWithSymKey have been

PK11_DecryptWithSymKey and PK11_EncryptWithSymKey have been
renamed PK11_Decrypt and PK11_Encrypt.

gcm.c: Don't call PORT_Memcpy with a NULL source buffer pointer.
Use a better error code if the input buffer is too small.

ecp_256_32.c: Remove the extra BYTESWAP32 and BYTESWAP64 for
big-endian processors.

R=rsleevi@chromium.org,rtenneti@chromium.org
BUG=none
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=191424

[Ryan Sleevi, 2013-03-29 19:26:41]

lgtm

[commit-bot: I haz the power, 2013-03-29 19:27:31]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/wtc@chromium.org/13327005/1

[commit-bot: I haz the power, 2013-03-29 19:27:39]

Failed to apply patch for third_party/nss/patches/nss-pk11-encrypt.patch:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  patching file third_party/nss/patches/nss-pk11-encrypt.patch
  Hunk #1 FAILED at 1.
  Hunk #2 FAILED at 30.
  Hunk #3 FAILED at 50.
  Hunk #4 FAILED at 73.
  Hunk #5 FAILED at 98.
  5 out of 5 hunks FAILED -- saving rejects to file
third_party/nss/patches/nss-pk11-encrypt.patch.rej

Patch:   N   third_party/nss/patches/nss-pk11-encrypt.patch
Index: patches/nss-pk11-encrypt.patch
===================================================================
--- third_party/nss/patches/nss-pk11-encrypt.patch	(revision 190723)
+++ third_party/nss/patches/nss-pk11-encrypt.patch	(working copy)
@@ -1,17 +1,17 @@
 Index: mozilla/security/nss/lib/pk11wrap/pk11obj.c
 ===================================================================
---- mozilla/security/nss/lib/pk11wrap/pk11obj.c	(revision 182578)
+--- mozilla/security/nss/lib/pk11wrap/pk11obj.c	(revision 190722)
 +++ mozilla/security/nss/lib/pk11wrap/pk11obj.c	(working copy)
 @@ -822,6 +822,93 @@
      return SECSuccess;
  }
  
 +SECStatus
-+PK11_EncryptWithSymKey(PK11SymKey *symKey,
-+                       CK_MECHANISM_TYPE mechanism, SECItem *param,
-+                       unsigned char *out, unsigned int *outLen,
-+                       unsigned int maxLen,
-+                       const unsigned char *data, unsigned dataLen)
++PK11_Decrypt(PK11SymKey *symKey,
++             CK_MECHANISM_TYPE mechanism, SECItem *param,
++             unsigned char *out, unsigned int *outLen,
++             unsigned int maxLen,
++             const unsigned char *enc, unsigned encLen)
 +{
 +    PK11SlotInfo *slot = symKey->slot;
 +    CK_MECHANISM mech = {0, NULL, 0 };
@@ -30,17 +30,18 @@
 +    session = pk11_GetNewSession(slot, &owner);
 +    haslock = (!owner || !slot->isThreadSafe);
 +    if (haslock) PK11_EnterSlotMonitor(slot);
-+    crv = PK11_GETTAB(slot)->C_EncryptInit(session, &mech, symKey->objectID);
++    crv = PK11_GETTAB(slot)->C_DecryptInit(session, &mech, symKey->objectID);
 +    if (crv != CKR_OK) {
 +	if (haslock) PK11_ExitSlotMonitor(slot);
-+	pk11_CloseSession(slot,session,owner);
++	pk11_CloseSession(slot, session, owner);
 +	PORT_SetError( PK11_MapError(crv) );
 +	return SECFailure;
 +    }
-+    crv = PK11_GETTAB(slot)->C_Encrypt(session, (unsigned char *)data,
-+                                       dataLen, out, &len);
++
++    crv = PK11_GETTAB(slot)->C_Decrypt(session, (unsigned char *)enc, encLen,
++                                       out, &len);
 +    if (haslock) PK11_ExitSlotMonitor(slot);
-+    pk11_CloseSession(slot,session,owner);
++    pk11_CloseSession(slot, session, owner);
 +    *outLen = len;
 +    if (crv != CKR_OK) {
 +	PORT_SetError( PK11_MapError(crv) );
@@ -50,11 +51,11 @@
 +}
 +
 +SECStatus
-+PK11_DecryptWithSymKey(PK11SymKey *symKey,
-+                       CK_MECHANISM_TYPE mechanism, SECItem *param,
-+                       unsigned char *out, unsigned int *outLen,
-+                       unsigned int maxLen,
-+                       const unsigned char *enc, unsigned encLen)
++PK11_Encrypt(PK11SymKey *symKey,
++             CK_MECHANISM_TYPE mechanism, SECItem *param,
++             unsigned char *out, unsigned int *outLen,
++             unsigned int maxLen,
++             const unsigned char *data, unsigned int dataLen)
 +{
 +    PK11SlotInfo *slot = symKey->slot;
 +    CK_MECHANISM mech = {0, NULL, 0 };
@@ -73,18 +74,17 @@
 +    session = pk11_GetNewSession(slot, &owner);
 +    haslock = (!owner || !slot->isThreadSafe);
 +    if (haslock) PK11_EnterSlotMonitor(slot);
-+    crv = PK11_GETTAB(slot)->C_DecryptInit(session, &mech, symKey->objectID);
++    crv = PK11_GETTAB(slot)->C_EncryptInit(session, &mech, symKey->objectID);
 +    if (crv != CKR_OK) {
 +	if (haslock) PK11_ExitSlotMonitor(slot);
-+	pk11_CloseSession(slot, session, owner);
++	pk11_CloseSession(slot,session,owner);
 +	PORT_SetError( PK11_MapError(crv) );
 +	return SECFailure;
 +    }
-+
-+    crv = PK11_GETTAB(slot)->C_Decrypt(session, (unsigned char *)enc, encLen,
-+                                       out, &len);
++    crv = PK11_GETTAB(slot)->C_Encrypt(session, (unsigned char *)data,
++                                       dataLen, out, &len);
 +    if (haslock) PK11_ExitSlotMonitor(slot);
-+    pk11_CloseSession(slot, session, owner);
++    pk11_CloseSession(slot,session,owner);
 +    *outLen = len;
 +    if (crv != CKR_OK) {
 +	PORT_SetError( PK11_MapError(crv) );
@@ -98,22 +98,31 @@
   * RSA keys, or they'll fail. We do the checks up front. If anyone comes
 Index: mozilla/security/nss/lib/pk11wrap/pk11pub.h
 ===================================================================
---- mozilla/security/nss/lib/pk11wrap/pk11pub.h	(revision 182578)
+--- mozilla/security/nss/lib/pk11wrap/pk11pub.h	(revision 190722)
 +++ mozilla/security/nss/lib/pk11wrap/pk11pub.h	(working copy)
+@@ -266,7 +266,7 @@
+ CK_MECHANISM_TYPE PK11_MapSignKeyType(KeyType keyType);
+ 
+ /**********************************************************************
+- *                   Symetric, Public, and Private Keys 
++ *                   Symmetric, Public, and Private Keys 
+  **********************************************************************/
+ void PK11_FreeSymKey(PK11SymKey *key);
+ PK11SymKey *PK11_ReferenceSymKey(PK11SymKey *symKey);
 @@ -508,6 +508,17 @@
  				       void *wincx);
  int PK11_GetPrivateModulusLen(SECKEYPrivateKey *key); 
  
-+SECStatus PK11_EncryptWithSymKey(PK11SymKey *symKey,
-+			CK_MECHANISM_TYPE mechanism, SECItem *param,
-+			unsigned char *out, unsigned int *outLen,
-+			unsigned int maxLen,
-+			const unsigned char *data, unsigned dataLen);
-+SECStatus PK11_DecryptWithSymKey(PK11SymKey *symkey,
-+			CK_MECHANISM_TYPE mechanism, SECItem *param,
-+			unsigned char *out, unsigned int *outLen,
-+			unsigned int maxLen,
-+			const unsigned char *enc, unsigned encLen);
++SECStatus PK11_Decrypt(PK11SymKey *symkey,
++		       CK_MECHANISM_TYPE mechanism, SECItem *param,
++		       unsigned char *out, unsigned int *outLen,
++		       unsigned int maxLen,
++		       const unsigned char *enc, unsigned int encLen);
++SECStatus PK11_Encrypt(PK11SymKey *symKey,
++		       CK_MECHANISM_TYPE mechanism, SECItem *param,
++		       unsigned char *out, unsigned int *outLen,
++		       unsigned int maxLen,
++		       const unsigned char *data, unsigned int dataLen);
 +
  /* note: despite the name, this function takes a private key. */
  SECStatus PK11_PubDecryptRaw(SECKEYPrivateKey *key, unsigned char *data,

[wtc, 2013-03-29 19:28:54]

Committed patchset #1 manually as r191424 (presubmit successful).

[ramant (doing other things), 2013-03-29 19:35:10]

lgtm

https://codereview.chromium.org/13327005/diff/1/mozilla/security/nss/lib/pk11...
File mozilla/security/nss/lib/pk11wrap/pk11obj.c (right):

https://codereview.chromium.org/13327005/diff/1/mozilla/security/nss/lib/pk11...
mozilla/security/nss/lib/pk11wrap/pk11obj.c:904: *outLen = len;
nit: why delete spaces between arguments in line# 903?

[wtc, 2013-03-29 20:52:19]

https://codereview.chromium.org/13327005/diff/1/mozilla/security/nss/lib/pk11...
File mozilla/security/nss/lib/pk11wrap/pk11obj.c (right):

https://codereview.chromium.org/13327005/diff/1/mozilla/security/nss/lib/pk11...
mozilla/security/nss/lib/pk11wrap/pk11obj.c:904: *outLen = len;

On 2013/03/29 19:35:10, ramant wrote:
> nit: why delete spaces between arguments in line# 903?

What I did here was to reorder the PK11_Encrypt and PK11_Decrypt
functions, listing PK11_Decrypt before Pk11_Encrypt.
In one function there were no spaces between the arguments.

NSS doesn't have a good Style Guide, so this kind of
inconsistency is common.