From b2af663a4683044b5ef8592723c09d84dcc61ae7 Mon Sep 17 00:00:00 2001
From: Pion <59523206+pionbot@users.noreply.github.com>
Date: Tue, 9 Apr 2024 03:12:56 +0000
Subject: [PATCH 1/2] Update CI configs to v0.11.12

Update lint scripts and CI configs.
---
 .github/workflows/test.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index ad6eb90ff9..08e4272a8e 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -27,6 +27,7 @@ jobs:
       fail-fast: false
     with:
       go-version: ${{ matrix.go }}
+    secrets: inherit
 
   test-i386:
     uses: pion/.goassets/.github/workflows/test-i386.reusable.yml@master
@@ -41,3 +42,4 @@ jobs:
     uses: pion/.goassets/.github/workflows/test-wasm.reusable.yml@master
     with:
       go-version: "1.22" # auto-update/latest-go-version
+    secrets: inherit

From a5205241ff7606c6c5230d3c793f2be268995773 Mon Sep 17 00:00:00 2001
From: Stephan Rotolante <stephanrotolante@gmail.com>
Date: Sun, 7 Apr 2024 02:28:38 -0400
Subject: [PATCH 2/2] Skip some checks when BUNDLE group value is found

Resolves #2621
---
 sdp.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/sdp.go b/sdp.go
index 980f985077..0b034d294a 100644
--- a/sdp.go
+++ b/sdp.go
@@ -709,8 +709,13 @@ func extractFingerprint(desc *sdp.SessionDescription) (string, string, error) {
 		return "", "", ErrSessionDescriptionNoFingerprint
 	}
 
+	// https://github.com/pion/webrtc/issues/2621
+	groupAttribue, _ := desc.Attribute(sdp.AttrKeyGroup)
+
+	isBundled := strings.Contains(groupAttribue, "BUNDLE")
+
 	for _, m := range fingerprints {
-		if m != fingerprints[0] {
+		if m != fingerprints[0] && !isBundled {
 			return "", "", ErrSessionDescriptionConflictingFingerprints
 		}
 	}
@@ -769,14 +774,19 @@ func extractICEDetails(desc *sdp.SessionDescription, log logging.LeveledLogger)
 		return "", "", nil, ErrSessionDescriptionMissingIcePwd
 	}
 
+	// https://github.com/pion/webrtc/issues/2621
+	groupAttribue, _ := desc.Attribute(sdp.AttrKeyGroup)
+
+	isBundled := strings.Contains(groupAttribue, "BUNDLE")
+
 	for _, m := range remoteUfrags {
-		if m != remoteUfrags[0] {
+		if m != remoteUfrags[0] && !isBundled {
 			return "", "", nil, ErrSessionDescriptionConflictingIceUfrag
 		}
 	}
 
 	for _, m := range remotePwds {
-		if m != remotePwds[0] {
+		if m != remotePwds[0] && !isBundled {
 			return "", "", nil, ErrSessionDescriptionConflictingIcePwd
 		}
 	}