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

Side by Side Diff: talk/media/base/cryptoparams.h

Issue 1455233005: Revert of Convert internal representation of Srtp cryptos from string to int. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 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 | « talk/app/webrtc/webrtcsession.cc ('k') | talk/session/media/channel.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 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
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 are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 17 matching lines...) Expand all
28 #ifndef TALK_MEDIA_BASE_CRYPTOPARAMS_H_ 28 #ifndef TALK_MEDIA_BASE_CRYPTOPARAMS_H_
29 #define TALK_MEDIA_BASE_CRYPTOPARAMS_H_ 29 #define TALK_MEDIA_BASE_CRYPTOPARAMS_H_
30 30
31 #include <string> 31 #include <string>
32 32
33 namespace cricket { 33 namespace cricket {
34 34
35 // Parameters for SRTP negotiation, as described in RFC 4568. 35 // Parameters for SRTP negotiation, as described in RFC 4568.
36 struct CryptoParams { 36 struct CryptoParams {
37 CryptoParams() : tag(0) {} 37 CryptoParams() : tag(0) {}
38 CryptoParams(int t, 38 CryptoParams(int t, const std::string& cs,
39 const std::string& cs, 39 const std::string& kp, const std::string& sp)
40 const std::string& kp,
41 const std::string& sp)
42 : tag(t), cipher_suite(cs), key_params(kp), session_params(sp) {} 40 : tag(t), cipher_suite(cs), key_params(kp), session_params(sp) {}
43 41
44 bool Matches(const CryptoParams& params) const { 42 bool Matches(const CryptoParams& params) const {
45 return (tag == params.tag && cipher_suite == params.cipher_suite); 43 return (tag == params.tag && cipher_suite == params.cipher_suite);
46 } 44 }
47 45
48 int tag; 46 int tag;
49 std::string cipher_suite; 47 std::string cipher_suite;
50 std::string key_params; 48 std::string key_params;
51 std::string session_params; 49 std::string session_params;
52 }; 50 };
53 51
54 } // namespace cricket 52 } // namespace cricket
55 53
56 #endif // TALK_MEDIA_BASE_CRYPTOPARAMS_H_ 54 #endif // TALK_MEDIA_BASE_CRYPTOPARAMS_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsession.cc ('k') | talk/session/media/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698