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

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

 /*
  * softoken.h - private data structures and prototypes for the softoken lib
  *
  * 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/. */
-/* $Id: softoken.h,v 1.28 2012/04/25 14:50:10 gerv%gerv.net Exp $ */
+/* $Id: softoken.h,v 1.29 2013/02/05 02:19:52 ryan.sleevi%gmail.com Exp $ */
 
 #ifndef _SOFTOKEN_H_
 #define _SOFTOKEN_H_
 
 #include "blapi.h"
 #include "lowkeyti.h"
 #include "softoknt.h"
 #include "secoidt.h"
 
-#include "pkcs11t.h"     /* CK_RV Required for sftk_fipsPowerUpSelfTest(). */
+#include "pkcs11t.h"
 
 SEC_BEGIN_PROTOS
 
 /*
 ** RSA encryption/decryption. When encrypting/decrypting the output
 ** buffer must be at least the size of the public key modulus.
 */
 
 /*
 ** Format some data into a PKCS#1 encryption block, preparing the
@@ skipping 59 matching lines @@
                             unsigned char *sign, unsigned int sign_len);
 extern
 SECStatus RSA_EncryptBlock(NSSLOWKEYPublicKey *key, unsigned char *output,
                            unsigned int *outputLen, unsigned int maxOutputLen,
                            unsigned char *input, unsigned int inputLen);
 extern
 SECStatus RSA_DecryptBlock(NSSLOWKEYPrivateKey *key, unsigned char *output,
                            unsigned int *outputLen, unsigned int maxOutputLen,
                            unsigned char *input, unsigned int inputLen);
 
+extern
+SECStatus RSA_EncryptOAEP(CK_RSA_PKCS_OAEP_PARAMS *oaepParams,
+                          NSSLOWKEYPublicKey *key,
+                          unsigned char *output, unsigned int *outputLen,
+                          unsigned int maxOutputLen,
+                          const unsigned char *input, unsigned int inputLen);
+
+extern
+SECStatus RSA_DecryptOAEP(CK_RSA_PKCS_OAEP_PARAMS *oaepParams,
+                          NSSLOWKEYPrivateKey *key,
+                          unsigned char *output, unsigned int *outputLen,
+                          unsigned int maxOutputLen,
+                          const unsigned char *input, unsigned int inputLen);
+
 /*
  * added to make pkcs #11 happy
  *   RAW is RSA_X_509
  */
 extern
 SECStatus RSA_SignRaw( NSSLOWKEYPrivateKey *key, unsigned char *output,
                          unsigned int *output_len, unsigned int maxOutputLen,
                          unsigned char *input, unsigned int input_len);
 extern
 SECStatus RSA_CheckSignRaw( NSSLOWKEYPublicKey *key, unsigned char *sign, 
@@ skipping 248 matching lines @@
 #ifndef NO_FORK_CHECK
 #define NO_FORK_CHECK
 #endif
 
 #endif
 
 
 SEC_END_PROTOS
 
 #endif /* _SOFTOKEN_H_ */