| OLD | NEW |
| 1 /* ***** BEGIN LICENSE BLOCK ***** | 1 /* ***** BEGIN LICENSE BLOCK ***** |
| 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 | 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
| 3 * | 3 * |
| 4 * The contents of this file are subject to the Mozilla Public License Version | 4 * The contents of this file are subject to the Mozilla Public License Version |
| 5 * 1.1 (the "License"); you may not use this file except in compliance with | 5 * 1.1 (the "License"); you may not use this file except in compliance with |
| 6 * the License. You may obtain a copy of the License at | 6 * the License. You may obtain a copy of the License at |
| 7 * http://www.mozilla.org/MPL/ | 7 * http://www.mozilla.org/MPL/ |
| 8 * | 8 * |
| 9 * Software distributed under the License is distributed on an "AS IS" basis, | 9 * Software distributed under the License is distributed on an "AS IS" basis, |
| 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License | 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 #ifndef CRYPTO_THIRD_PARTY_NSS_CHROMIUM_NSS_H_ | 37 #ifndef CRYPTO_THIRD_PARTY_NSS_CHROMIUM_NSS_H_ |
| 38 #define CRYPTO_THIRD_PARTY_NSS_CHROMIUM_NSS_H_ | 38 #define CRYPTO_THIRD_PARTY_NSS_CHROMIUM_NSS_H_ |
| 39 #pragma once | 39 #pragma once |
| 40 | 40 |
| 41 // This file contains some functions we borrowed from NSS. | 41 // This file contains some functions we borrowed from NSS. |
| 42 | 42 |
| 43 #include <keyhi.h> | 43 #include <keyhi.h> |
| 44 #include <secmod.h> | 44 #include <secmod.h> |
| 45 | 45 |
| 46 #include "crypto/crypto_export.h" | |
| 47 | |
| 48 // Like PK11_ImportEncryptedPrivateKeyInfo, but hardcoded for EC, and returns | 46 // Like PK11_ImportEncryptedPrivateKeyInfo, but hardcoded for EC, and returns |
| 49 // the SECKEYPrivateKey. | 47 // the SECKEYPrivateKey. |
| 50 // See https://bugzilla.mozilla.org/show_bug.cgi?id=211546 | 48 // See https://bugzilla.mozilla.org/show_bug.cgi?id=211546 |
| 51 // When we use NSS 3.13.2 or later, | 49 // When we use NSS 3.13.2 or later, |
| 52 // PK11_ImportEncryptedPrivateKeyInfoAndReturnKey can be used instead. | 50 // PK11_ImportEncryptedPrivateKeyInfoAndReturnKey can be used instead. |
| 53 SECStatus ImportEncryptedECPrivateKeyInfoAndReturnKey( | 51 SECStatus ImportEncryptedECPrivateKeyInfoAndReturnKey( |
| 54 PK11SlotInfo* slot, | 52 PK11SlotInfo* slot, |
| 55 SECKEYEncryptedPrivateKeyInfo* epki, | 53 SECKEYEncryptedPrivateKeyInfo* epki, |
| 56 SECItem* password, | 54 SECItem* password, |
| 57 SECItem* nickname, | 55 SECItem* nickname, |
| 58 SECItem* public_value, | 56 SECItem* public_value, |
| 59 PRBool permanent, | 57 PRBool permanent, |
| 60 PRBool sensitive, | 58 PRBool sensitive, |
| 61 SECKEYPrivateKey** private_key, | 59 SECKEYPrivateKey** private_key, |
| 62 void* wincx); | 60 void* wincx); |
| 63 | 61 |
| 64 // Like SEC_DerSignData. | |
| 65 CRYPTO_EXPORT SECStatus DerSignData(PLArenaPool *arena, | |
| 66 SECItem *result, | |
| 67 SECItem *input, | |
| 68 SECKEYPrivateKey *key, | |
| 69 SECOidTag algo_id); | |
| 70 | |
| 71 #endif // CRYPTO_THIRD_PARTY_NSS_CHROMIUM_NSS_H_ | 62 #endif // CRYPTO_THIRD_PARTY_NSS_CHROMIUM_NSS_H_ |
| OLD | NEW |