Merge branch 'master' into stop-pc-bug

Author: yngrtc

.github/workflows/cargo.yml

@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: ["ubuntu-latest", "macos-latest"]
         toolchain:
-          - 1.63.0 # min supported version (https://github.com/webrtc-rs/webrtc/#toolchain)
+          - 1.65.0 # min supported version (https://github.com/webrtc-rs/webrtc/#toolchain)
           - stable
     runs-on: ${{ matrix.os }}
     steps:

README.md

@@ -105,7 +105,7 @@ This project is still in active and early development stage, please refer to the
 
 ### Toolchain
 
-**Minimum Supported Rust Version:** `1.63.0`
+**Minimum Supported Rust Version:** `1.65.0`
 
 Our minimum supported rust version(MSRV) policy is to support versions of the compiler released within the last six months. We don't eagerly bump the minimum version we support, instead the minimum will be bumped on a needed by needed basis, usually because downstream dependencies force us to.
 

dtls/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "webrtc-dtls"
-version = "0.7.1"
+version = "0.7.2"
 authors = ["Rain Liu <[email protected]>"]
 edition = "2021"
 description = "A pure Rust implementation of DTLS"
@@ -17,11 +17,7 @@ util = { version = "0.7.0", path = "../util", package = "webrtc-util", default-f
 
 byteorder = "1"
 rand_core = "0.6.3"
-elliptic-curve = { version = "0.12.1", features = ["default", "ecdh"] }
-# required because elliptic-curve requires "0.12", but "0.12.0" does not compile.
 hkdf = "~0.12.1"
-# required because elliptic-curve requires "3", but "3.0.0" does not compile.
-curve25519-dalek = "3.2"
 p256 = { version = "0.11.1", features = ["default", "ecdh", "ecdsa"] }
 p384 = "0.11.2"
 rand = "0.8.5"
@@ -35,8 +31,7 @@ aes-gcm = "0.10.1"
 ccm = "0.3.0"
 tokio = { version = "1.19", features = ["full"] }
 async-trait = "0.1.56"
-x25519-dalek = "2.0.0-pre.1"
-signature = "1.2.2"
+x25519-dalek = { version = "2.0.0-rc.2", features = ["static_secrets"] }
 x509-parser = "0.13.2"
 der-parser = "8.1"
 rcgen = "0.10.0"

dtls/src/config.rs

@@ -134,36 +134,26 @@ pub(crate) type PskCallback = Arc<dyn (Fn(&[u8]) -> Result<Vec<u8>>) + Send + Sy
 
 // ClientAuthType declares the policy the server will follow for
 // TLS Client Authentication.
-#[derive(Copy, Clone, PartialEq, Eq)]
+#[derive(Default, Copy, Clone, PartialEq, Eq)]
 pub enum ClientAuthType {
+    #[default]
     NoClientCert = 0,
     RequestClientCert = 1,
     RequireAnyClientCert = 2,
     VerifyClientCertIfGiven = 3,
     RequireAndVerifyClientCert = 4,
 }
 
-impl Default for ClientAuthType {
-    fn default() -> Self {
-        ClientAuthType::NoClientCert
-    }
-}
-
 // ExtendedMasterSecretType declares the policy the client and server
 // will follow for the Extended Master Secret extension
-#[derive(PartialEq, Eq, Copy, Clone)]
+#[derive(Default, PartialEq, Eq, Copy, Clone)]
 pub enum ExtendedMasterSecretType {
+    #[default]
     Request = 0,
     Require = 1,
     Disable = 2,
 }
 
-impl Default for ExtendedMasterSecretType {
-    fn default() -> Self {
-        ExtendedMasterSecretType::Request
-    }
-}
-
 pub(crate) fn validate_config(is_client: bool, config: &Config) -> Result<()> {
     if is_client && config.psk.is_some() && config.psk_identity_hint.is_none() {
         return Err(Error::ErrPskAndIdentityMustBeSetForClient);

dtls/src/content.rs

@@ -7,12 +7,13 @@ use crate::error::*;
 use std::io::{Read, Write};
 
 // https://tools.ietf.org/html/rfc4346#section-6.2.1
-#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+#[derive(Default, Copy, Clone, PartialEq, Eq, Debug)]
 pub enum ContentType {
     ChangeCipherSpec = 20,
     Alert = 21,
     Handshake = 22,
     ApplicationData = 23,
+    #[default]
     Invalid,
 }
 
@@ -28,12 +29,6 @@ impl From<u8> for ContentType {
     }
 }
 
-impl Default for ContentType {
-    fn default() -> Self {
-        ContentType::Invalid
-    }
-}
-
 #[derive(PartialEq, Debug, Clone)]
 pub enum Content {
     ChangeCipherSpec(ChangeCipherSpec),

dtls/src/curve/named_curve.rs

@@ -54,7 +54,7 @@ fn elliptic_curve_keypair(curve: NamedCurve) -> Result<NamedCurveKeypair> {
             )
         }
         NamedCurve::X25519 => {
-            let secret_key = x25519_dalek::StaticSecret::new(OsRng);
+            let secret_key = x25519_dalek::StaticSecret::random_from_rng(OsRng);
             let public_key = x25519_dalek::PublicKey::from(&secret_key);
             (
                 public_key.as_bytes().to_vec(),

dtls/src/handshake/mod.rs

@@ -34,7 +34,7 @@ use handshake_message_server_hello_done::*;
 use handshake_message_server_key_exchange::*;
 
 // https://tools.ietf.org/html/rfc5246#section-7.4
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
+#[derive(Default, Copy, Clone, Debug, PartialEq, Eq, Hash)]
 pub enum HandshakeType {
     HelloRequest = 0,
     ClientHello = 1,
@@ -47,6 +47,7 @@ pub enum HandshakeType {
     CertificateVerify = 15,
     ClientKeyExchange = 16,
     Finished = 20,
+    #[default]
     Invalid,
 }
 
@@ -88,12 +89,6 @@ impl From<u8> for HandshakeType {
     }
 }
 
-impl Default for HandshakeType {
-    fn default() -> Self {
-        HandshakeType::Invalid
-    }
-}
-
 #[derive(PartialEq, Debug, Clone)]
 pub enum HandshakeMessage {
     //HelloRequest(errNotImplemented),

examples/examples/play-from-disk-h264/play-from-disk-h264.rs

@@ -172,7 +172,7 @@ async fn main() -> Result<()> {
             // Open a H264 file and start reading using our H264Reader
             let file = File::open(&video_file_name)?;
             let reader = BufReader::new(file);
-            let mut h264 = H264Reader::new(reader);
+            let mut h264 = H264Reader::new(reader, 1_048_576);
 
             // Wait for connection established
             notify_video.notified().await;

examples/examples/signal/Cargo.toml

@@ -8,6 +8,6 @@ edition = "2021"
 [dependencies]
 tokio = { version = "1.15.0", features = ["full"] }
 anyhow = "1.0.52"
-base64 = "0.13.0"
+base64 = "0.21.2"
 lazy_static = "1.4"
 hyper = { version = "0.14.16", features = ["full"] }

examples/examples/signal/src/lib.rs

@@ -2,6 +2,8 @@
 #![allow(dead_code)]
 
 use anyhow::Result;
+use base64::prelude::BASE64_STANDARD;
+use base64::Engine;
 use hyper::service::{make_service_fn, service_fn};
 use hyper::{Body, Method, Request, Response, Server, StatusCode};
 use std::net::SocketAddr;
@@ -92,13 +94,13 @@ pub fn encode(b: &str) -> String {
     //    b = zip(b)
     //}
 
-    base64::encode(b)
+    BASE64_STANDARD.encode(b)
 }
 
 /// decode decodes the input from base64
 /// It can optionally unzip the input after decoding
 pub fn decode(s: &str) -> Result<String> {
-    let b = base64::decode(s)?;
+    let b = BASE64_STANDARD.decode(s)?;
 
     //if COMPRESS {
     //    b = unzip(b)