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

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: Disable GCM if ENABLE_EXTERNAL_AUTH is defined. Created 4 years, 5 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
« no previous file with comments | « webrtc/base/helpers_unittest.cc ('k') | webrtc/base/sslstreamadapter.h » ('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 * 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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 // SSL_CTX_set_tlsext_use_srtp(). 49 // SSL_CTX_set_tlsext_use_srtp().
50 struct SrtpCipherMapEntry { 50 struct SrtpCipherMapEntry {
51 const char* internal_name; 51 const char* internal_name;
52 const int id; 52 const int id;
53 }; 53 };
54 54
55 // This isn't elegant, but it's better than an external reference 55 // This isn't elegant, but it's better than an external reference
56 static SrtpCipherMapEntry SrtpCipherMap[] = { 56 static SrtpCipherMapEntry SrtpCipherMap[] = {
57 {"SRTP_AES128_CM_SHA1_80", SRTP_AES128_CM_SHA1_80}, 57 {"SRTP_AES128_CM_SHA1_80", SRTP_AES128_CM_SHA1_80},
58 {"SRTP_AES128_CM_SHA1_32", SRTP_AES128_CM_SHA1_32}, 58 {"SRTP_AES128_CM_SHA1_32", SRTP_AES128_CM_SHA1_32},
59 {"SRTP_AEAD_AES_128_GCM", SRTP_AEAD_AES_128_GCM},
60 {"SRTP_AEAD_AES_256_GCM", SRTP_AEAD_AES_256_GCM},
59 {nullptr, 0}}; 61 {nullptr, 0}};
60 #endif 62 #endif
61 63
62 #ifdef OPENSSL_IS_BORINGSSL 64 #ifdef OPENSSL_IS_BORINGSSL
63 static void TimeCallback(const SSL* ssl, struct timeval* out_clock) { 65 static void TimeCallback(const SSL* ssl, struct timeval* out_clock) {
64 uint64_t time = TimeNanos(); 66 uint64_t time = TimeNanos();
65 out_clock->tv_sec = time / kNumNanosecsPerSec; 67 out_clock->tv_sec = time / kNumNanosecsPerSec;
66 out_clock->tv_usec = time / kNumNanosecsPerMicrosec; 68 out_clock->tv_usec = time / kNumNanosecsPerMicrosec;
67 } 69 }
68 #else // #ifdef OPENSSL_IS_BORINGSSL 70 #else // #ifdef OPENSSL_IS_BORINGSSL
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1219 return true; 1221 return true;
1220 } 1222 }
1221 } 1223 }
1222 1224
1223 return false; 1225 return false;
1224 } 1226 }
1225 1227
1226 } // namespace rtc 1228 } // namespace rtc
1227 1229
1228 #endif // HAVE_OPENSSL_SSL_H 1230 #endif // HAVE_OPENSSL_SSL_H
OLDNEW
« no previous file with comments | « webrtc/base/helpers_unittest.cc ('k') | webrtc/base/sslstreamadapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698