mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00
0d018415d5
This reverts commit ee212a72f2.
Reason for revert: Don't remove until downstream issues resolved
Original change's description:
> Remove code supporting the SDES crypto mode in SDP
>
> Removes the ability to accept nonencrypted answers to encrypted offers.
> Fixes some logic around bundled sessions and requirement for
> transport parameters.
>
> Bug: webrtc:11066
> Change-Id: I56d8628d223614918a1e5260fdb8a117c8c02dbd
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/236344
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Niels Moller <nisse@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#35298}
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: webrtc:11066
Change-Id: I0c400ceffe1b08e0be7b44abbb54c8a032128f05
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/237223
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35312}
41 lines
1.2 KiB
C++
41 lines
1.2 KiB
C++
/*
|
|
* Copyright (c) 2004 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef API_CRYPTO_PARAMS_H_
|
|
#define API_CRYPTO_PARAMS_H_
|
|
|
|
#include <string>
|
|
|
|
namespace cricket {
|
|
|
|
// Parameters for SRTP negotiation, as described in RFC 4568.
|
|
// TODO(benwright) - Rename to SrtpCryptoParams as these only apply to SRTP and
|
|
// not generic crypto parameters for WebRTC.
|
|
struct CryptoParams {
|
|
CryptoParams() : tag(0) {}
|
|
CryptoParams(int t,
|
|
const std::string& cs,
|
|
const std::string& kp,
|
|
const std::string& sp)
|
|
: tag(t), cipher_suite(cs), key_params(kp), session_params(sp) {}
|
|
|
|
bool Matches(const CryptoParams& params) const {
|
|
return (tag == params.tag && cipher_suite == params.cipher_suite);
|
|
}
|
|
|
|
int tag;
|
|
std::string cipher_suite;
|
|
std::string key_params;
|
|
std::string session_params;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // API_CRYPTO_PARAMS_H_
|