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

Side by Side Diff: openssl/ssl/ssl_err.c

Issue 59083010: third_party/openssl: add ChaCha20+Poly1305 support. Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « openssl/ssl/ssl_ciph.c ('k') | openssl/ssl/ssl_lib.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 /* ssl/ssl_err.c */ 1 /* ssl/ssl_err.c */
2 /* ==================================================================== 2 /* ====================================================================
3 * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 {ERR_FUNC(SSL_F_SSL_USE_PRIVATEKEY), "SSL_use_PrivateKey"}, 273 {ERR_FUNC(SSL_F_SSL_USE_PRIVATEKEY), "SSL_use_PrivateKey"},
274 {ERR_FUNC(SSL_F_SSL_USE_PRIVATEKEY_ASN1), "SSL_use_PrivateKey_ASN1"}, 274 {ERR_FUNC(SSL_F_SSL_USE_PRIVATEKEY_ASN1), "SSL_use_PrivateKey_ASN1"},
275 {ERR_FUNC(SSL_F_SSL_USE_PRIVATEKEY_FILE), "SSL_use_PrivateKey_file"}, 275 {ERR_FUNC(SSL_F_SSL_USE_PRIVATEKEY_FILE), "SSL_use_PrivateKey_file"},
276 {ERR_FUNC(SSL_F_SSL_USE_PSK_IDENTITY_HINT), "SSL_use_psk_identity_hint"}, 276 {ERR_FUNC(SSL_F_SSL_USE_PSK_IDENTITY_HINT), "SSL_use_psk_identity_hint"},
277 {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY), "SSL_use_RSAPrivateKey"}, 277 {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY), "SSL_use_RSAPrivateKey"},
278 {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1), "SSL_use_RSAPrivateKey_ASN1"}, 278 {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_ASN1), "SSL_use_RSAPrivateKey_ASN1"},
279 {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE), "SSL_use_RSAPrivateKey_file"}, 279 {ERR_FUNC(SSL_F_SSL_USE_RSAPRIVATEKEY_FILE), "SSL_use_RSAPrivateKey_file"},
280 {ERR_FUNC(SSL_F_SSL_VERIFY_CERT_CHAIN), "SSL_VERIFY_CERT_CHAIN"}, 280 {ERR_FUNC(SSL_F_SSL_VERIFY_CERT_CHAIN), "SSL_VERIFY_CERT_CHAIN"},
281 {ERR_FUNC(SSL_F_SSL_WRITE), "SSL_write"}, 281 {ERR_FUNC(SSL_F_SSL_WRITE), "SSL_write"},
282 {ERR_FUNC(SSL_F_TLS1_CERT_VERIFY_MAC), "tls1_cert_verify_mac"}, 282 {ERR_FUNC(SSL_F_TLS1_CERT_VERIFY_MAC), "tls1_cert_verify_mac"},
283 {ERR_FUNC(SSL_F_TLS1_CHANGE_CIPHER_STATE),» "TLS1_CHANGE_CIPHER_STATE"}, 283 {ERR_FUNC(SSL_F_TLS1_AEAD_CTX_INIT),» "TLS1_AEAD_CTX_INIT"},
284 {ERR_FUNC(SSL_F_TLS1_CHANGE_CIPHER_STATE),» "tls1_change_cipher_state"},
285 {ERR_FUNC(SSL_F_TLS1_CHANGE_CIPHER_STATE_AEAD),»"TLS1_CHANGE_CIPHER_STATE_AEAD"} ,
286 {ERR_FUNC(SSL_F_TLS1_CHANGE_CIPHER_STATE_CIPHER),» "TLS1_CHANGE_CIPHER_STAT E_CIPHER"},
284 {ERR_FUNC(SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT), "TLS1_CHECK_SERVERHELLO_TLSEXT"} , 287 {ERR_FUNC(SSL_F_TLS1_CHECK_SERVERHELLO_TLSEXT), "TLS1_CHECK_SERVERHELLO_TLSEXT"} ,
285 {ERR_FUNC(SSL_F_TLS1_ENC), "TLS1_ENC"}, 288 {ERR_FUNC(SSL_F_TLS1_ENC), "TLS1_ENC"},
286 {ERR_FUNC(SSL_F_TLS1_EXPORT_KEYING_MATERIAL), "TLS1_EXPORT_KEYING_MATERIAL"}, 289 {ERR_FUNC(SSL_F_TLS1_EXPORT_KEYING_MATERIAL), "TLS1_EXPORT_KEYING_MATERIAL"},
287 {ERR_FUNC(SSL_F_TLS1_HEARTBEAT), "SSL_F_TLS1_HEARTBEAT"}, 290 {ERR_FUNC(SSL_F_TLS1_HEARTBEAT), "SSL_F_TLS1_HEARTBEAT"},
288 {ERR_FUNC(SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT), "TLS1_PREPARE_CLIENTHELL O_TLSEXT"}, 291 {ERR_FUNC(SSL_F_TLS1_PREPARE_CLIENTHELLO_TLSEXT), "TLS1_PREPARE_CLIENTHELL O_TLSEXT"},
289 {ERR_FUNC(SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT), "TLS1_PREPARE_SERVERHELL O_TLSEXT"}, 292 {ERR_FUNC(SSL_F_TLS1_PREPARE_SERVERHELLO_TLSEXT), "TLS1_PREPARE_SERVERHELL O_TLSEXT"},
290 {ERR_FUNC(SSL_F_TLS1_PRF), "tls1_prf"}, 293 {ERR_FUNC(SSL_F_TLS1_PRF), "tls1_prf"},
291 {ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK), "TLS1_SETUP_KEY_BLOCK"}, 294 {ERR_FUNC(SSL_F_TLS1_SETUP_KEY_BLOCK), "TLS1_SETUP_KEY_BLOCK"},
292 {ERR_FUNC(SSL_F_WRITE_PENDING), "WRITE_PENDING"}, 295 {ERR_FUNC(SSL_F_WRITE_PENDING), "WRITE_PENDING"},
293 {0,NULL} 296 {0,NULL}
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 { 616 {
614 #ifndef OPENSSL_NO_ERR 617 #ifndef OPENSSL_NO_ERR
615 618
616 if (ERR_func_error_string(SSL_str_functs[0].error) == NULL) 619 if (ERR_func_error_string(SSL_str_functs[0].error) == NULL)
617 { 620 {
618 ERR_load_strings(0,SSL_str_functs); 621 ERR_load_strings(0,SSL_str_functs);
619 ERR_load_strings(0,SSL_str_reasons); 622 ERR_load_strings(0,SSL_str_reasons);
620 } 623 }
621 #endif 624 #endif
622 } 625 }
OLDNEW
« no previous file with comments | « openssl/ssl/ssl_ciph.c ('k') | openssl/ssl/ssl_lib.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698