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

Side by Side Diff: net/third_party/nss/ssl/sslimpl.h

Issue 13843023: Use CERT_GetCertKeyType to get KeyType for ssl3_PlatformSignHashes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed code review comments. Created 7 years, 8 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 | « net/third_party/nss/ssl/ssl3con.c ('k') | net/third_party/nss/ssl/sslplatf.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * This file is PRIVATE to SSL and should be the first thing included by 2 * This file is PRIVATE to SSL and should be the first thing included by
3 * any SSL implementation file. 3 * any SSL implementation file.
4 * 4 *
5 * This Source Code Form is subject to the terms of the Mozilla Public 5 * This Source Code Form is subject to the terms of the Mozilla Public
6 * License, v. 2.0. If a copy of the MPL was not distributed with this 6 * License, v. 2.0. If a copy of the MPL was not distributed with this
7 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 7 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
8 /* $Id: sslimpl.h,v 1.108 2012/09/28 01:46:45 wtc%google.com Exp $ */ 8 /* $Id: sslimpl.h,v 1.108 2012/09/28 01:46:45 wtc%google.com Exp $ */
9 9
10 #ifndef __sslimpl_h_ 10 #ifndef __sslimpl_h_
11 #define __sslimpl_h_ 11 #define __sslimpl_h_
12 12
13 #ifdef DEBUG 13 #ifdef DEBUG
14 #undef NDEBUG 14 #undef NDEBUG
15 #else 15 #else
16 #undef NDEBUG 16 #undef NDEBUG
17 #define NDEBUG 17 #define NDEBUG
18 #endif 18 #endif
19 #include "secport.h" 19 #include "secport.h"
20 #include "secerr.h" 20 #include "secerr.h"
21 #include "sslerr.h" 21 #include "sslerr.h"
22 #include "ssl3prot.h" 22 #include "ssl3prot.h"
23 #include "hasht.h" 23 #include "hasht.h"
24 #include "keythi.h"
24 #include "nssilock.h" 25 #include "nssilock.h"
25 #include "pkcs11t.h" 26 #include "pkcs11t.h"
26 #if defined(XP_UNIX) || defined(XP_BEOS) 27 #if defined(XP_UNIX) || defined(XP_BEOS)
27 #include "unistd.h" 28 #include "unistd.h"
28 #endif 29 #endif
29 #include "nssrwlk.h" 30 #include "nssrwlk.h"
30 #include "prthread.h" 31 #include "prthread.h"
31 #include "prclist.h" 32 #include "prclist.h"
32 33
33 #include "sslt.h" /* for some formerly private types, now public */ 34 #include "sslt.h" /* for some formerly private types, now public */
(...skipping 1752 matching lines...) Expand 10 before | Expand all | Expand 10 after
1786 1787
1787 /***************** platform client auth ****************/ 1788 /***************** platform client auth ****************/
1788 1789
1789 #ifdef NSS_PLATFORM_CLIENT_AUTH 1790 #ifdef NSS_PLATFORM_CLIENT_AUTH
1790 // Releases the platform key. 1791 // Releases the platform key.
1791 extern void ssl_FreePlatformKey(PlatformKey key); 1792 extern void ssl_FreePlatformKey(PlatformKey key);
1792 1793
1793 // Implement the client CertificateVerify message for SSL3/TLS1.0 1794 // Implement the client CertificateVerify message for SSL3/TLS1.0
1794 extern SECStatus ssl3_PlatformSignHashes(SSL3Hashes *hash, 1795 extern SECStatus ssl3_PlatformSignHashes(SSL3Hashes *hash,
1795 PlatformKey key, SECItem *buf, 1796 PlatformKey key, SECItem *buf,
1796 PRBool isTLS); 1797 PRBool isTLS, KeyType keyType);
1797 1798
1798 // Converts a CERTCertList* (A collection of CERTCertificates) into a 1799 // Converts a CERTCertList* (A collection of CERTCertificates) into a
1799 // CERTCertificateList* (A collection of SECItems), or returns NULL if 1800 // CERTCertificateList* (A collection of SECItems), or returns NULL if
1800 // it cannot be converted. 1801 // it cannot be converted.
1801 // This is to allow the platform-supplied chain to be created with purely 1802 // This is to allow the platform-supplied chain to be created with purely
1802 // public API functions, using the preferred CERTCertList mutators, rather 1803 // public API functions, using the preferred CERTCertList mutators, rather
1803 // pushing this hack to clients. 1804 // pushing this hack to clients.
1804 extern CERTCertificateList* hack_NewCertificateListFromCertList( 1805 extern CERTCertificateList* hack_NewCertificateListFromCertList(
1805 CERTCertList* list); 1806 CERTCertList* list);
1806 #endif /* NSS_PLATFORM_CLIENT_AUTH */ 1807 #endif /* NSS_PLATFORM_CLIENT_AUTH */
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
1874 #elif defined(_WIN32_WCE) 1875 #elif defined(_WIN32_WCE)
1875 #define SSL_GETPID GetCurrentProcessId 1876 #define SSL_GETPID GetCurrentProcessId
1876 #elif defined(WIN32) 1877 #elif defined(WIN32)
1877 extern int __cdecl _getpid(void); 1878 extern int __cdecl _getpid(void);
1878 #define SSL_GETPID _getpid 1879 #define SSL_GETPID _getpid
1879 #else 1880 #else
1880 #define SSL_GETPID() 0 1881 #define SSL_GETPID() 0
1881 #endif 1882 #endif
1882 1883
1883 #endif /* __sslimpl_h_ */ 1884 #endif /* __sslimpl_h_ */
OLDNEW
« no previous file with comments | « net/third_party/nss/ssl/ssl3con.c ('k') | net/third_party/nss/ssl/sslplatf.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698