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

Side by Side Diff: webrtc/base/opensslstreamadapter.cc

Issue 1528843005: Add support for GCM cipher suites from RFC 7714. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Added PeerConnection tests using GCM ciphers, fixed passing of flag through DtlsTransportChannel. Created 5 years 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
OLDNEW
1 /* 1 /*
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 // SSL_CTX_set_tlsext_use_srtp(). 48 // SSL_CTX_set_tlsext_use_srtp().
49 struct SrtpCipherMapEntry { 49 struct SrtpCipherMapEntry {
50 const char* internal_name; 50 const char* internal_name;
51 const int id; 51 const int id;
52 }; 52 };
53 53
54 // This isn't elegant, but it's better than an external reference 54 // This isn't elegant, but it's better than an external reference
55 static SrtpCipherMapEntry SrtpCipherMap[] = { 55 static SrtpCipherMapEntry SrtpCipherMap[] = {
56 {"SRTP_AES128_CM_SHA1_80", SRTP_AES128_CM_SHA1_80}, 56 {"SRTP_AES128_CM_SHA1_80", SRTP_AES128_CM_SHA1_80},
57 {"SRTP_AES128_CM_SHA1_32", SRTP_AES128_CM_SHA1_32}, 57 {"SRTP_AES128_CM_SHA1_32", SRTP_AES128_CM_SHA1_32},
58 {"SRTP_AEAD_AES_128_GCM", SRTP_AEAD_AES_128_GCM},
59 {"SRTP_AEAD_AES_256_GCM", SRTP_AEAD_AES_256_GCM},
58 {nullptr, 0}}; 60 {nullptr, 0}};
59 #endif 61 #endif
60 62
61 #ifndef OPENSSL_IS_BORINGSSL 63 #ifndef OPENSSL_IS_BORINGSSL
62 64
63 // Cipher name table. Maps internal OpenSSL cipher ids to the RFC name. 65 // Cipher name table. Maps internal OpenSSL cipher ids to the RFC name.
64 struct SslCipherMapEntry { 66 struct SslCipherMapEntry {
65 uint32_t openssl_id; 67 uint32_t openssl_id;
66 const char* rfc_name; 68 const char* rfc_name;
67 }; 69 };
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after
1163 } 1165 }
1164 } else { 1166 } else {
1165 RTC_NOTREACHED(); 1167 RTC_NOTREACHED();
1166 return kDefaultSslEcCipher12; 1168 return kDefaultSslEcCipher12;
1167 } 1169 }
1168 } 1170 }
1169 1171
1170 } // namespace rtc 1172 } // namespace rtc
1171 1173
1172 #endif // HAVE_OPENSSL_SSL_H 1174 #endif // HAVE_OPENSSL_SSL_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698