Update to NSS 3.14.3 Beta 1 for the TLS CBC constant-time

mozilla/security/nss/lib/softoken/pkcs11i.h

 /* 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/. */
 /*
  * Internal data structures and functions used by pkcs11.c
  */
 #ifndef _PKCS11I_H_
 #define _PKCS11I_H_ 1
 
 #include "nssilock.h"
@@ skipping 83 matching lines @@
 typedef struct SFTKObjectListElementStr SFTKObjectListElement;
 typedef struct SFTKObjectStr SFTKObject;
 typedef struct SFTKSessionObjectStr SFTKSessionObject;
 typedef struct SFTKTokenObjectStr SFTKTokenObject;
 typedef struct SFTKSessionStr SFTKSession;
 typedef struct SFTKSlotStr SFTKSlot;
 typedef struct SFTKSessionContextStr SFTKSessionContext;
 typedef struct SFTKSearchResultsStr SFTKSearchResults;
 typedef struct SFTKHashVerifyInfoStr SFTKHashVerifyInfo;
 typedef struct SFTKHashSignInfoStr SFTKHashSignInfo;
+typedef struct SFTKOAEPEncryptInfoStr SFTKOAEPEncryptInfo;
+typedef struct SFTKOAEPDecryptInfoStr SFTKOAEPDecryptInfo;
 typedef struct SFTKSSLMACInfoStr SFTKSSLMACInfo;
 typedef struct SFTKItemTemplateStr SFTKItemTemplate;
 
 /* define function pointer typdefs for pointer tables */
 typedef void (*SFTKDestroy)(void *, PRBool);
 typedef void (*SFTKBegin)(void *);
 typedef SECStatus (*SFTKCipher)(void *,void *,unsigned int *,unsigned int,
                                         void *, unsigned int);
 typedef SECStatus (*SFTKVerify)(void *,void *,unsigned int,void *,unsigned int);
 typedef void (*SFTKHash)(void *,void *,unsigned int);
@@ skipping 251 matching lines @@
     void                *params;
     NSSLOWKEYPublicKey  *key;
 };
 
 struct SFTKHashSignInfoStr {
     SECOidTag           hashOid;
     void                *params;
     NSSLOWKEYPrivateKey *key;
 };
 
+/**
+ * Contexts for RSA-OAEP
+ */
+struct SFTKOAEPEncryptInfoStr {
+    CK_RSA_PKCS_OAEP_PARAMS *params;
+    NSSLOWKEYPublicKey *key;
+};
+
+struct SFTKOAEPDecryptInfoStr {
+    CK_RSA_PKCS_OAEP_PARAMS *params;
+    NSSLOWKEYPrivateKey *key;
+};
+
 /* context for the Final SSLMAC message */
 struct SFTKSSLMACInfoStr {
     void                *hashContext;
     SFTKBegin           begin;
     SFTKHash            update;
     SFTKEnd             end;
     CK_ULONG            macSize;
     int                 padSize;
     unsigned char       key[MAX_KEY_LEN];
     unsigned int        keySize;
@@ skipping 301 matching lines @@
                    SFTKObject * key);
 extern
 CK_RV jpake_Round2(HASH_HashType hashType,
                    CK_NSS_JPAKERound2Params * params,
                    SFTKObject * sourceKey, SFTKObject * key);
 extern
 CK_RV jpake_Final(HASH_HashType hashType,
                   const CK_NSS_JPAKEFinalParams * params,
                   SFTKObject * sourceKey, SFTKObject * key);
 
+/* Constant time MAC functions (hmacct.c) */
+
+struct sftk_MACConstantTimeCtxStr {
+    const SECHashObject *hash;
+    unsigned char mac[64];
+    unsigned char secret[64];
+    unsigned int headerLength;
+    unsigned int secretLength;
+    unsigned int totalLength;
+    unsigned char header[75];
+};
+typedef struct sftk_MACConstantTimeCtxStr sftk_MACConstantTimeCtx;
+sftk_MACConstantTimeCtx* sftk_HMACConstantTime_New(
+        CK_MECHANISM_PTR mech, SFTKObject *key);
+sftk_MACConstantTimeCtx* sftk_SSLv3MACConstantTime_New(
+        CK_MECHANISM_PTR mech, SFTKObject *key);
+void sftk_HMACConstantTime_Update(void *pctx, void *data, unsigned int len);
+void sftk_SSLv3MACConstantTime_Update(void *pctx, void *data, unsigned int len);
+void sftk_MACConstantTime_EndHash(
+        void *pctx, void *out, unsigned int *outLength, unsigned int maxLength);
+void sftk_MACConstantTime_DestroyContext(void *pctx, PRBool);
+
 /****************************************
  * implement TLS Pseudo Random Function (PRF)
  */
 
 extern CK_RV
 sftk_TLSPRFInit(SFTKSessionContext *context, 
                   SFTKObject *        key, 
                   CK_KEY_TYPE         key_type);
 
 SEC_END_PROTOS
 
 #endif /* _PKCS11I_H_ */