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

Side by Side Diff: crypto/third_party/nss/chromium-nss.h

Issue 10695140: Remove #pragma once from crypto (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « crypto/symmetric_key.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 18 matching lines...) Expand all
29 * use your version of this file under the terms of the MPL, indicate your 29 * use your version of this file under the terms of the MPL, indicate your
30 * decision by deleting the provisions above and replace them with the notice 30 * decision by deleting the provisions above and replace them with the notice
31 * and other provisions required by the GPL or the LGPL. If you do not delete 31 * and other provisions required by the GPL or the LGPL. If you do not delete
32 * the provisions above, a recipient may use your version of this file under 32 * the provisions above, a recipient may use your version of this file under
33 * the terms of any one of the MPL, the GPL or the LGPL. 33 * the terms of any one of the MPL, the GPL or the LGPL.
34 * 34 *
35 * ***** END LICENSE BLOCK ***** */ 35 * ***** END LICENSE BLOCK ***** */
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
40 39
41 // This file contains some functions we borrowed from NSS. 40 // This file contains some functions we borrowed from NSS.
42 41
43 #include <keyhi.h> 42 #include <keyhi.h>
44 #include <secmod.h> 43 #include <secmod.h>
45 44
46 #include "crypto/crypto_export.h" 45 #include "crypto/crypto_export.h"
47 46
48 // Like PK11_ImportEncryptedPrivateKeyInfo, but hardcoded for EC, and returns 47 // Like PK11_ImportEncryptedPrivateKeyInfo, but hardcoded for EC, and returns
49 // the SECKEYPrivateKey. 48 // the SECKEYPrivateKey.
(...skipping 12 matching lines...) Expand all
62 void* wincx); 61 void* wincx);
63 62
64 // Like SEC_DerSignData. 63 // Like SEC_DerSignData.
65 CRYPTO_EXPORT SECStatus DerSignData(PLArenaPool *arena, 64 CRYPTO_EXPORT SECStatus DerSignData(PLArenaPool *arena,
66 SECItem *result, 65 SECItem *result,
67 SECItem *input, 66 SECItem *input,
68 SECKEYPrivateKey *key, 67 SECKEYPrivateKey *key,
69 SECOidTag algo_id); 68 SECOidTag algo_id);
70 69
71 #endif // CRYPTO_THIRD_PARTY_NSS_CHROMIUM_NSS_H_ 70 #endif // CRYPTO_THIRD_PARTY_NSS_CHROMIUM_NSS_H_
OLDNEW
« no previous file with comments | « crypto/symmetric_key.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698