Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1794)

Unified Diff: mozilla/security/nss/lib/softoken/softoken.h

Issue 12207073: Update to NSS 3.14.3 Beta 1 for the TLS CBC constant-time (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Remove unrelated WIN64 changes from nss.gyp Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mozilla/security/nss/lib/softoken/softkver.h ('k') | mozilla/security/nss/lib/softoken/softoknt.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mozilla/security/nss/lib/softoken/softoken.h
===================================================================
--- mozilla/security/nss/lib/softoken/softoken.h (revision 180595)
+++ mozilla/security/nss/lib/softoken/softoken.h (working copy)
@@ -4,7 +4,7 @@
* 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_
@@ -14,7 +14,7 @@
#include "softoknt.h"
#include "secoidt.h"
-#include "pkcs11t.h" /* CK_RV Required for sftk_fipsPowerUpSelfTest(). */
+#include "pkcs11t.h"
SEC_BEGIN_PROTOS
@@ -94,6 +94,20 @@
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
« no previous file with comments | « mozilla/security/nss/lib/softoken/softkver.h ('k') | mozilla/security/nss/lib/softoken/softoknt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698