Skip to content

Commit

Permalink
Update Modules/mediastream to use std::span more
Browse files Browse the repository at this point in the history 
https://bugs.webkit.org/show_bug.cgi?id=271495

Reviewed by Ryosuke Niwa.

* Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.cpp:
(WebCore::readUInt64):
(WebCore::parseSFrameHeader):
(WebCore::RTCRtpSFrameTransformer::decryptFrame):
(WebCore::RTCRtpSFrameTransformer::encryptFrame):
(WebCore::RTCRtpSFrameTransformer::decryptData):
(WebCore::RTCRtpSFrameTransformer::encryptData):
(WebCore::RTCRtpSFrameTransformer::computeEncryptedDataSignature):
* Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.h:
* Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformerCocoa.cpp:
(WebCore::RTCRtpSFrameTransformer::decryptData):
(WebCore::RTCRtpSFrameTransformer::encryptData):
(WebCore::RTCRtpSFrameTransformer::computeEncryptedDataSignature):
* Source/WebCore/Modules/mediastream/SFrameUtils.cpp:
(WebCore::findNalus):
(WebCore::computeH264PrefixOffset):
(WebCore::needsRbspUnescaping):
(WebCore::fromRbsp):
(WebCore::computeH264PrefixBuffer):
(WebCore::isVP8KeyFrame):
(WebCore::computeVP8PrefixOffset):
(WebCore::computeVP8PrefixBuffer):
* Source/WebCore/Modules/mediastream/SFrameUtils.h:
* Source/WebCore/Modules/mediastream/STUNMessageParsing.cpp:
(WebCore::WebRTC::extractSTUNOrTURNMessages):
(WebCore::WebRTC::extractDataMessages):
(WebCore::WebRTC::extractMessages):
* Source/WebCore/Modules/mediastream/STUNMessageParsing.h:
* Source/WebCore/crypto/cocoa/CryptoAlgorithmAESCTRMac.cpp:
(WebCore::CryptoAlgorithmAESCTR::platformEncrypt):
(WebCore::CryptoAlgorithmAESCTR::platformDecrypt):
* Source/WebCore/crypto/cocoa/CryptoUtilitiesCocoa.cpp:
(WebCore::transformAESCTR):
* Source/WebCore/crypto/cocoa/CryptoUtilitiesCocoa.h:

Canonical link: https://commits.webkit.org/276611@main
  • Loading branch information
@cdumez
cdumez committed Mar 24, 2024
1 parent 9122a31 commit 76d4bdd
Show file tree
Hide file tree
Showing 13 changed files with 104 additions and 114 deletions.
86 changes: 39 additions & 47 deletions Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ static inline void writeUInt64(uint8_t* data, uint64_t value, uint8_t valueLengt
*data++ = (value >> ((valueLength - 1 - i) * 8)) & 0xff;
}

static inline uint64_t readUInt64(const uint8_t* data, size_t size)
static inline uint64_t readUInt64(std::span<const uint8_t> data)
{
uint64_t value = 0;
while (size--)
value = (value << 8) | *data++;
for (auto byte : data)
value = (value << 8) | byte;
return value;
}

Expand Down Expand Up @@ -106,40 +106,41 @@ struct SFrameHeaderInfo {
uint64_t keyId;
uint64_t counter;
};
static inline std::optional<SFrameHeaderInfo> parseSFrameHeader(const uint8_t* data, size_t size)
static inline std::optional<SFrameHeaderInfo> parseSFrameHeader(std::span<const uint8_t> data)
{
auto* start = data;
auto* start = data.data();

uint64_t keyId = 0;
uint64_t counter = 0;

auto firstByte = *data++;
auto firstByte = data.front();
data = data.subspan(1);

// Signature bit.
if (hasSignature(firstByte))
return { };

size_t counterLength = ((firstByte >> 4) & 0x07) + 1;

if (size < counterLength + 1)
if (data.size() < counterLength + 1)
return { };

if (hasLongKeyLength(firstByte)) {
size_t keyLength = (firstByte & 0x07) + 1;
if (size < counterLength + keyLength + 1)
if (data.size() < counterLength + keyLength + 1)
return { };

keyId = readUInt64(data, keyLength);
data += keyLength;
keyId = readUInt64(data.first(keyLength));
data = data.subspan(keyLength);

counter = readUInt64(data, counterLength);
data += counterLength;
counter = readUInt64(data.first(counterLength));
data = data.subspan(counterLength);
} else {
keyId = firstByte & 0x07;
counter = readUInt64(data, counterLength);
data += counterLength;
counter = readUInt64(data.first(counterLength));
data = data.subspan(counterLength);
}
uint8_t headerSize = data - start;
uint8_t headerSize = data.data() - start;
return SFrameHeaderInfo { headerSize, keyId, counter };
}

Expand Down Expand Up @@ -208,26 +209,20 @@ ExceptionOr<void> RTCRtpSFrameTransformer::updateEncryptionKey(const Vector<uint

RTCRtpSFrameTransformer::TransformResult RTCRtpSFrameTransformer::decryptFrame(std::span<const uint8_t> data)
{
auto* frameData = data.data();
auto frameSize = data.size();

Vector<uint8_t> buffer;
switch (m_compatibilityMode) {
case CompatibilityMode::H264: {
auto offset = computeH264PrefixOffset(frameData, frameSize);
frameData += offset;
frameSize -= offset;
if (needsRbspUnescaping(frameData, frameSize)) {
buffer = fromRbsp(frameData, frameSize);
frameData = buffer.data();
frameSize = buffer.size();
auto offset = computeH264PrefixOffset(data);
data = data.subspan(offset);
if (needsRbspUnescaping(data)) {
buffer = fromRbsp(data);
data = buffer.span();
}
break;
}
case CompatibilityMode::VP8: {
auto offset = computeVP8PrefixOffset(frameData, frameSize);
frameData += offset;
frameSize -= offset;
auto offset = computeVP8PrefixOffset(data);
data = data.subspan(offset);
break;
}
case CompatibilityMode::None:
Expand All @@ -236,7 +231,7 @@ RTCRtpSFrameTransformer::TransformResult RTCRtpSFrameTransformer::decryptFrame(s

Locker locker { m_keyLock };

auto header = parseSFrameHeader(frameData, frameSize);
auto header = parseSFrameHeader(data);

if (!header)
return makeUnexpected(ErrorInformation {Error::Syntax, "Invalid header"_s, 0 });
Expand All @@ -254,14 +249,14 @@ RTCRtpSFrameTransformer::TransformResult RTCRtpSFrameTransformer::decryptFrame(s
return makeUnexpected(ErrorInformation {Error::Other, result.exception().message(), 0 });
}

if (frameSize < (header->size + m_authenticationSize))
if (data.size() < (header->size + m_authenticationSize))
return makeUnexpected(ErrorInformation { Error::Syntax, "Chunk is too small for authentication size"_s, 0 });

auto iv = computeIV(m_counter, m_saltKey);

// Compute signature
auto* transmittedSignature = frameData + frameSize - m_authenticationSize;
auto signature = computeEncryptedDataSignature(iv, frameData, header->size, frameData + header->size, frameSize - m_authenticationSize - header->size, m_authenticationKey);
auto transmittedSignature = data.last(m_authenticationSize);
auto signature = computeEncryptedDataSignature(iv, data.first(header->size), data.subspan(header->size, data.size() - m_authenticationSize - header->size), m_authenticationKey);
for (size_t cptr = 0; cptr < m_authenticationSize; ++cptr) {
if (signature[cptr] != transmittedSignature[cptr]) {
// FIXME: We should try ratcheting.
Expand All @@ -270,8 +265,8 @@ RTCRtpSFrameTransformer::TransformResult RTCRtpSFrameTransformer::decryptFrame(s
}

// Decrypt data
auto dataSize = frameSize - header->size - m_authenticationSize;
auto result = decryptData(frameData + header->size, dataSize, iv, m_encryptionKey);
auto dataSize = data.size() - header->size - m_authenticationSize;
auto result = decryptData(data.subspan(header->size, dataSize), iv, m_encryptionKey);

if (result.hasException())
return makeUnexpected(ErrorInformation { Error::Other, result.exception().message(), 0 });
Expand All @@ -281,18 +276,15 @@ RTCRtpSFrameTransformer::TransformResult RTCRtpSFrameTransformer::decryptFrame(s

RTCRtpSFrameTransformer::TransformResult RTCRtpSFrameTransformer::encryptFrame(std::span<const uint8_t> data)
{
auto* frameData = data.data();
auto frameSize = data.size();

static const unsigned MaxHeaderSize = 17;

SFrameCompatibilityPrefixBuffer prefixBuffer;
switch (m_compatibilityMode) {
case CompatibilityMode::H264:
prefixBuffer = computeH264PrefixBuffer(frameData, frameSize);
prefixBuffer = computeH264PrefixBuffer(data);
break;
case CompatibilityMode::VP8:
prefixBuffer = computeVP8PrefixBuffer(frameData, frameSize);
prefixBuffer = computeVP8PrefixBuffer(data);
break;
case CompatibilityMode::None:
break;
Expand All @@ -302,7 +294,7 @@ RTCRtpSFrameTransformer::TransformResult RTCRtpSFrameTransformer::encryptFrame(s

auto iv = computeIV(m_counter, m_saltKey);

Vector<uint8_t> transformedData(prefixBuffer.size + frameSize + MaxHeaderSize + m_authenticationSize);
Vector<uint8_t> transformedData(prefixBuffer.size + data.size() + MaxHeaderSize + m_authenticationSize);

if (prefixBuffer.data)
std::memcpy(transformedData.data(), prefixBuffer.data, prefixBuffer.size);
Expand All @@ -324,16 +316,16 @@ RTCRtpSFrameTransformer::TransformResult RTCRtpSFrameTransformer::encryptFrame(s
transformedData.shrink(transformedData.size() - (MaxHeaderSize - headerSize));

// Fill encrypted data
auto encryptedData = encryptData(frameData, frameSize, iv, m_encryptionKey);
auto encryptedData = encryptData(data, iv, m_encryptionKey);
ASSERT(!encryptedData.hasException());
if (encryptedData.hasException())
return makeUnexpected(ErrorInformation { Error::Other, encryptedData.exception().message(), 0 });

std::memcpy(newDataPointer + headerSize, encryptedData.returnValue().data(), frameSize);
std::memcpy(newDataPointer + headerSize, encryptedData.returnValue().data(), data.size());

// Fill signature
auto signature = computeEncryptedDataSignature(iv, newDataPointer, headerSize, newDataPointer + headerSize, frameSize, m_authenticationKey);
std::memcpy(newDataPointer + frameSize + headerSize, signature.data(), m_authenticationSize);
auto signature = computeEncryptedDataSignature(iv, std::span { newDataPointer, headerSize }, std::span { newDataPointer + headerSize, data.size() }, m_authenticationKey);
std::memcpy(newDataPointer + data.size() + headerSize, signature.data(), m_authenticationSize);

if (m_compatibilityMode == CompatibilityMode::H264)
toRbsp(transformedData, prefixBuffer.size);
Expand Down Expand Up @@ -367,17 +359,17 @@ ExceptionOr<Vector<uint8_t>> RTCRtpSFrameTransformer::computeEncryptionKey(const
return Exception { ExceptionCode::NotSupportedError };
}

ExceptionOr<Vector<uint8_t>> RTCRtpSFrameTransformer::decryptData(const uint8_t*, size_t, const Vector<uint8_t>&, const Vector<uint8_t>&)
ExceptionOr<Vector<uint8_t>> RTCRtpSFrameTransformer::decryptData(std::span<const uint8_t>, const Vector<uint8_t>&, const Vector<uint8_t>&)
{
return Exception { ExceptionCode::NotSupportedError };
}

ExceptionOr<Vector<uint8_t>> RTCRtpSFrameTransformer::encryptData(const uint8_t*, size_t, const Vector<uint8_t>&, const Vector<uint8_t>&)
ExceptionOr<Vector<uint8_t>> RTCRtpSFrameTransformer::encryptData(std::span<const uint8_t>, const Vector<uint8_t>&, const Vector<uint8_t>&)
{
return Exception { ExceptionCode::NotSupportedError };
}

Vector<uint8_t> RTCRtpSFrameTransformer::computeEncryptedDataSignature(const Vector<uint8_t>&, const uint8_t*, size_t, const uint8_t*, size_t, const Vector<uint8_t>&)
Vector<uint8_t> RTCRtpSFrameTransformer::computeEncryptedDataSignature(const Vector<uint8_t>&, std::span<const uint8_t>, std::span<const uint8_t>, const Vector<uint8_t>&)
{
return { };
}
Expand Down
6 changes: 3 additions & 3 deletions Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ class RTCRtpSFrameTransformer : public ThreadSafeRefCounted<RTCRtpSFrameTransfor
ExceptionOr<Vector<uint8_t>> computeAuthenticationKey(const Vector<uint8_t>&);
ExceptionOr<Vector<uint8_t>> computeEncryptionKey(const Vector<uint8_t>&);

ExceptionOr<Vector<uint8_t>> encryptData(const uint8_t*, size_t, const Vector<uint8_t>& iv, const Vector<uint8_t>& key);
ExceptionOr<Vector<uint8_t>> decryptData(const uint8_t*, size_t, const Vector<uint8_t>& iv, const Vector<uint8_t>& key);
Vector<uint8_t> computeEncryptedDataSignature(const Vector<uint8_t>& nonce, const uint8_t* header, size_t headerSize, const uint8_t* data, size_t dataSize, const Vector<uint8_t>& key);
ExceptionOr<Vector<uint8_t>> encryptData(std::span<const uint8_t>, const Vector<uint8_t>& iv, const Vector<uint8_t>& key);
ExceptionOr<Vector<uint8_t>> decryptData(std::span<const uint8_t>, const Vector<uint8_t>& iv, const Vector<uint8_t>& key);
Vector<uint8_t> computeEncryptedDataSignature(const Vector<uint8_t>& nonce, std::span<const uint8_t> header, std::span<const uint8_t> data, const Vector<uint8_t>& key);
void updateAuthenticationSize();

mutable Lock m_keyLock;
Expand Down
18 changes: 9 additions & 9 deletions Source/WebCore/Modules/mediastream/RTCRtpSFrameTransformerCocoa.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@ ExceptionOr<Vector<uint8_t>> RTCRtpSFrameTransformer::computeEncryptionKey(const
return deriveHDKFSHA256Bits(key.returnValue().data(), 16, usage, sizeof(usage) - 1, info, sizeof(info) - 1, 128);
}

ExceptionOr<Vector<uint8_t>> RTCRtpSFrameTransformer::decryptData(const uint8_t* data, size_t size, const Vector<uint8_t>& iv, const Vector<uint8_t>& key)
ExceptionOr<Vector<uint8_t>> RTCRtpSFrameTransformer::decryptData(std::span<const uint8_t> data, const Vector<uint8_t>& iv, const Vector<uint8_t>& key)
{
return transformAESCTR(kCCDecrypt, iv, iv.size(), key, data, size);
return transformAESCTR(kCCDecrypt, iv, iv.size(), key, data);
}

ExceptionOr<Vector<uint8_t>> RTCRtpSFrameTransformer::encryptData(const uint8_t* data, size_t size, const Vector<uint8_t>& iv, const Vector<uint8_t>& key)
ExceptionOr<Vector<uint8_t>> RTCRtpSFrameTransformer::encryptData(std::span<const uint8_t> data, const Vector<uint8_t>& iv, const Vector<uint8_t>& key)
{
return transformAESCTR(kCCEncrypt, iv, iv.size(), key, data, size);
return transformAESCTR(kCCEncrypt, iv, iv.size(), key, data);
}

static inline Vector<uint8_t, 8> encodeBigEndian(uint64_t value)
Expand All @@ -89,19 +89,19 @@ static inline Vector<uint8_t, 8> encodeBigEndian(uint64_t value)
return result;
}

Vector<uint8_t> RTCRtpSFrameTransformer::computeEncryptedDataSignature(const Vector<uint8_t>& nonce, const uint8_t* header, size_t headerSize, const uint8_t* data, size_t dataSize, const Vector<uint8_t>& key)
Vector<uint8_t> RTCRtpSFrameTransformer::computeEncryptedDataSignature(const Vector<uint8_t>& nonce, std::span<const uint8_t> header, std::span<const uint8_t> data, const Vector<uint8_t>& key)
{
auto headerLength = encodeBigEndian(headerSize);
auto dataLength = encodeBigEndian(dataSize);
auto headerLength = encodeBigEndian(header.size());
auto dataLength = encodeBigEndian(data.size());

Vector<uint8_t> result(CC_SHA256_DIGEST_LENGTH);
CCHmacContext context;
CCHmacInit(&context, kCCHmacAlgSHA256, key.data(), key.size());
CCHmacUpdate(&context, headerLength.data(), headerLength.size());
CCHmacUpdate(&context, dataLength.data(), dataLength.size());
CCHmacUpdate(&context, nonce.data(), 12);
CCHmacUpdate(&context, header, headerSize);
CCHmacUpdate(&context, data, dataSize);
CCHmacUpdate(&context, header.data(), header.size());
CCHmacUpdate(&context, data.data(), data.size());
CCHmacFinal(&context, result.data());

return result;
Expand Down
Loading

0 comments on commit 76d4bdd

Please sign in to comment.