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

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

Issue 9663043: Add a boolean |had_context| argument to the TLS ExportKeyingMaterial (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Make suggested changes, add patch file Created 8 years, 9 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
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 * ***** BEGIN LICENSE BLOCK ***** 5 * ***** BEGIN LICENSE BLOCK *****
6 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 6 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
7 * 7 *
8 * The contents of this file are subject to the Mozilla Public License Version 8 * The contents of this file are subject to the Mozilla Public License Version
9 * 1.1 (the "License"); you may not use this file except in compliance with 9 * 1.1 (the "License"); you may not use this file except in compliance with
10 * the License. You may obtain a copy of the License at 10 * the License. You may obtain a copy of the License at
(...skipping 1697 matching lines...) Expand 10 before | Expand all | Expand 10 after
1708 extern int ssl_MapLowLevelError(int hiLevelError); 1708 extern int ssl_MapLowLevelError(int hiLevelError);
1709 1709
1710 extern PRUint32 ssl_Time(void); 1710 extern PRUint32 ssl_Time(void);
1711 1711
1712 extern void SSL_AtomicIncrementLong(long * x); 1712 extern void SSL_AtomicIncrementLong(long * x);
1713 1713
1714 SECStatus SSL_DisableDefaultExportCipherSuites(void); 1714 SECStatus SSL_DisableDefaultExportCipherSuites(void);
1715 SECStatus SSL_DisableExportCipherSuites(PRFileDesc * fd); 1715 SECStatus SSL_DisableExportCipherSuites(PRFileDesc * fd);
1716 PRBool SSL_IsExportCipherSuite(PRUint16 cipherSuite); 1716 PRBool SSL_IsExportCipherSuite(PRUint16 cipherSuite);
1717 1717
1718 SECStatus ssl3_TLSPRFWithMasterSecret( 1718 extern SECStatus
1719 » » » ssl3CipherSpec *spec, const char *label, 1719 ssl3_TLSPRFWithMasterSecret(ssl3CipherSpec *spec,
1720 » » » unsigned int labelLen, const unsigned char *val, 1720 const char *label, unsigned int labelLen,
1721 » » » unsigned int valLen, unsigned char *out, 1721 const unsigned char *val, unsigned int valLen,
1722 » » » unsigned int outLen); 1722 unsigned char *out, unsigned int outLen);
1723 1723
1724 #ifdef TRACE 1724 #ifdef TRACE
1725 #define SSL_TRACE(msg) ssl_Trace msg 1725 #define SSL_TRACE(msg) ssl_Trace msg
1726 #else 1726 #else
1727 #define SSL_TRACE(msg) 1727 #define SSL_TRACE(msg)
1728 #endif 1728 #endif
1729 1729
1730 void ssl_Trace(const char *format, ...); 1730 void ssl_Trace(const char *format, ...);
1731 1731
1732 SEC_END_PROTOS 1732 SEC_END_PROTOS
1733 1733
1734 #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) 1734 #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
1735 #define SSL_GETPID getpid 1735 #define SSL_GETPID getpid
1736 #elif defined(_WIN32_WCE) 1736 #elif defined(_WIN32_WCE)
1737 #define SSL_GETPID GetCurrentProcessId 1737 #define SSL_GETPID GetCurrentProcessId
1738 #elif defined(WIN32) 1738 #elif defined(WIN32)
1739 extern int __cdecl _getpid(void); 1739 extern int __cdecl _getpid(void);
1740 #define SSL_GETPID _getpid 1740 #define SSL_GETPID _getpid
1741 #else 1741 #else
1742 #define SSL_GETPID() 0 1742 #define SSL_GETPID() 0
1743 #endif 1743 #endif
1744 1744
1745 #endif /* __sslimpl_h_ */ 1745 #endif /* __sslimpl_h_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698