Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ func (e *RTCEngine) createPublisherPCLocked(configuration webrtc.Configuration)
IncludeDefaultInterceptors: e.connParams.IncludeDefaultInterceptors,
OnRTTUpdate: e.setRTT,
IsSender: true,
DTLSEllipticCurves: e.connParams.DTLSEllipticCurves,
}); err != nil {
return err
}
Expand Down Expand Up @@ -435,6 +436,7 @@ func (e *RTCEngine) createSubscriberPCLocked(configuration webrtc.Configuration)
RetransmitBufferSize: e.connParams.RetransmitBufferSize,
Interceptors: e.connParams.Interceptors,
IncludeDefaultInterceptors: e.connParams.IncludeDefaultInterceptors,
DTLSEllipticCurves: e.connParams.DTLSEllipticCurves,
}); err != nil {
return err
}
Expand Down
11 changes: 11 additions & 0 deletions room.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ import (
"github.com/livekit/protocol/auth"
protoCodecs "github.com/livekit/protocol/codecs"
"github.com/livekit/protocol/livekit"

dtlsElliptic "github.com/pion/dtls/v3/pkg/crypto/elliptic"
)

var (
Expand Down Expand Up @@ -195,6 +197,15 @@ func WithCodecs(codecs []livekit.Codec) ConnectOption {
}
}

// WithDTLSEllipticCurves configures the DTLS elliptic curves used for key exchange.
// Use this on FIPS 140-enabled systems to specify NIST-approved curves (e.g. P-256, P-384)
// instead of the default X25519.
func WithDTLSEllipticCurves(curves ...dtlsElliptic.Curve) ConnectOption {
return func(p *signalling.ConnectParams) {
p.DTLSEllipticCurves = curves
}
}

type PLIWriter func(webrtc.SSRC)

type Room struct {
Expand Down
3 changes: 3 additions & 0 deletions signalling/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"github.com/livekit/mediatransportutil/pkg/pacer"
"github.com/livekit/protocol/livekit"
protoLogger "github.com/livekit/protocol/logger"
dtlsElliptic "github.com/pion/dtls/v3/pkg/crypto/elliptic"
"github.com/pion/interceptor"
"github.com/pion/webrtc/v4"
"google.golang.org/protobuf/proto"
Expand Down Expand Up @@ -89,6 +90,8 @@ type ConnectParams struct {

ICETransportPolicy webrtc.ICETransportPolicy

DTLSEllipticCurves []dtlsElliptic.Curve // FIPS 140: override default DTLS curves

// internal use
Codecs []webrtc.RTPCodecParameters
}
Expand Down
5 changes: 5 additions & 0 deletions transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (

"github.com/bep/debounce"
"github.com/pion/dtls/v3"
dtlsElliptic "github.com/pion/dtls/v3/pkg/crypto/elliptic"
"github.com/pion/interceptor"
"github.com/pion/interceptor/pkg/nack"
"github.com/pion/interceptor/pkg/twcc"
Expand Down Expand Up @@ -79,6 +80,7 @@ type PCTransportParams struct {
IncludeDefaultInterceptors bool
OnRTTUpdate func(rtt uint32)
IsSender bool
DTLSEllipticCurves []dtlsElliptic.Curve
}

func (t *PCTransport) registerDefaultInterceptors(params PCTransportParams, i *interceptor.Registry) error {
Expand Down Expand Up @@ -208,6 +210,9 @@ func NewPCTransport(params PCTransportParams) (*PCTransport, error) {

se := webrtc.SettingEngine{}
se.SetSRTPProtectionProfiles(dtls.SRTP_AEAD_AES_128_GCM, dtls.SRTP_AES128_CM_HMAC_SHA1_80)
if len(params.DTLSEllipticCurves) > 0 {
se.SetDTLSEllipticCurves(params.DTLSEllipticCurves...)
}
se.SetDTLSRetransmissionInterval(dtlsRetransmissionInterval)
se.SetICETimeouts(iceDisconnectedTimeout, iceFailedTimeout, iceKeepaliveInterval)
lf := pionlogger.NewLoggerFactory(logger)
Expand Down
Loading