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

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

Issue 23619044: net: add ChaCha20+Poly1305 support to libssl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing wtc's comments. Created 7 years, 3 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 * 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 8
9 #ifndef __sslimpl_h_ 9 #ifndef __sslimpl_h_
10 #define __sslimpl_h_ 10 #define __sslimpl_h_
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #define calg_rc4 ssl_calg_rc4 58 #define calg_rc4 ssl_calg_rc4
59 #define calg_rc2 ssl_calg_rc2 59 #define calg_rc2 ssl_calg_rc2
60 #define calg_des ssl_calg_des 60 #define calg_des ssl_calg_des
61 #define calg_3des ssl_calg_3des 61 #define calg_3des ssl_calg_3des
62 #define calg_idea ssl_calg_idea 62 #define calg_idea ssl_calg_idea
63 #define calg_fortezza ssl_calg_fortezza /* deprecated, must preserve */ 63 #define calg_fortezza ssl_calg_fortezza /* deprecated, must preserve */
64 #define calg_aes ssl_calg_aes 64 #define calg_aes ssl_calg_aes
65 #define calg_camellia ssl_calg_camellia 65 #define calg_camellia ssl_calg_camellia
66 #define calg_seed ssl_calg_seed 66 #define calg_seed ssl_calg_seed
67 #define calg_aes_gcm ssl_calg_aes_gcm 67 #define calg_aes_gcm ssl_calg_aes_gcm
68 #define calg_chacha20 ssl_calg_chacha20
68 69
69 #define mac_null ssl_mac_null 70 #define mac_null ssl_mac_null
70 #define mac_md5 ssl_mac_md5 71 #define mac_md5 ssl_mac_md5
71 #define mac_sha ssl_mac_sha 72 #define mac_sha ssl_mac_sha
72 #define hmac_md5 ssl_hmac_md5 73 #define hmac_md5 ssl_hmac_md5
73 #define hmac_sha ssl_hmac_sha 74 #define hmac_sha ssl_hmac_sha
74 #define hmac_sha256 ssl_hmac_sha256 75 #define hmac_sha256 ssl_hmac_sha256
75 #define mac_aead ssl_mac_aead 76 #define mac_aead ssl_mac_aead
76 77
77 #define SET_ERROR_CODE /* reminder */ 78 #define SET_ERROR_CODE /* reminder */
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 unsigned int isPresent : 1; 286 unsigned int isPresent : 1;
286 #else 287 #else
287 ssl3CipherSuite cipher_suite; 288 ssl3CipherSuite cipher_suite;
288 PRUint8 policy; 289 PRUint8 policy;
289 unsigned char enabled : 1; 290 unsigned char enabled : 1;
290 unsigned char isPresent : 1; 291 unsigned char isPresent : 1;
291 #endif 292 #endif
292 } ssl3CipherSuiteCfg; 293 } ssl3CipherSuiteCfg;
293 294
294 #ifdef NSS_ENABLE_ECC 295 #ifdef NSS_ENABLE_ECC
295 #define ssl_V3_SUITES_IMPLEMENTED 61 296 #define ssl_V3_SUITES_IMPLEMENTED 63
296 #else 297 #else
297 #define ssl_V3_SUITES_IMPLEMENTED 37 298 #define ssl_V3_SUITES_IMPLEMENTED 37
298 #endif /* NSS_ENABLE_ECC */ 299 #endif /* NSS_ENABLE_ECC */
299 300
300 #define MAX_DTLS_SRTP_CIPHER_SUITES 4 301 #define MAX_DTLS_SRTP_CIPHER_SUITES 4
301 302
302 typedef struct sslOptionsStr { 303 typedef struct sslOptionsStr {
303 /* If SSL_SetNextProtoNego has been called, then this contains the 304 /* If SSL_SetNextProtoNego has been called, then this contains the
304 * list of supported protocols. */ 305 * list of supported protocols. */
305 SECItem nextProtoNego; 306 SECItem nextProtoNego;
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 cipher_des, 468 cipher_des,
468 cipher_3des, 469 cipher_3des,
469 cipher_des40, 470 cipher_des40,
470 cipher_idea, 471 cipher_idea,
471 cipher_aes_128, 472 cipher_aes_128,
472 cipher_aes_256, 473 cipher_aes_256,
473 cipher_camellia_128, 474 cipher_camellia_128,
474 cipher_camellia_256, 475 cipher_camellia_256,
475 cipher_seed, 476 cipher_seed,
476 cipher_aes_128_gcm, 477 cipher_aes_128_gcm,
478 cipher_chacha20,
477 cipher_missing /* reserved for no such supported cipher */ 479 cipher_missing /* reserved for no such supported cipher */
478 /* This enum must match ssl3_cipherName[] in ssl3con.c. */ 480 /* This enum must match ssl3_cipherName[] in ssl3con.c. */
479 } SSL3BulkCipher; 481 } SSL3BulkCipher;
480 482
481 typedef enum { type_stream, type_block, type_aead } CipherType; 483 typedef enum { type_stream, type_block, type_aead } CipherType;
482 484
483 #define MAX_IV_LENGTH 24 485 #define MAX_IV_LENGTH 24
484 486
485 /* 487 /*
486 * Do not depend upon 64 bit arithmetic in the underlying machine. 488 * Do not depend upon 64 bit arithmetic in the underlying machine.
(...skipping 1448 matching lines...) Expand 10 before | Expand all | Expand 10 after
1935 #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS) 1937 #if defined(XP_UNIX) || defined(XP_OS2) || defined(XP_BEOS)
1936 #define SSL_GETPID getpid 1938 #define SSL_GETPID getpid
1937 #elif defined(WIN32) 1939 #elif defined(WIN32)
1938 extern int __cdecl _getpid(void); 1940 extern int __cdecl _getpid(void);
1939 #define SSL_GETPID _getpid 1941 #define SSL_GETPID _getpid
1940 #else 1942 #else
1941 #define SSL_GETPID() 0 1943 #define SSL_GETPID() 0
1942 #endif 1944 #endif
1943 1945
1944 #endif /* __sslimpl_h_ */ 1946 #endif /* __sslimpl_h_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698