summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_tlsext.c
diff options
context:
space:
mode:
authorguenther <>2020-10-11 01:16:31 +0000
committerguenther <>2020-10-11 01:16:31 +0000
commitb6bb75f4585006b28ebc729355536e9e77226c3d (patch)
tree081ebd6053829d1d9d7bf9bb60beb046b604b46b /src/lib/libssl/ssl_tlsext.c
parent777484b19e29edc6126b0347b81a5d02728eeda2 (diff)
downloadopenbsd-b6bb75f4585006b28ebc729355536e9e77226c3d.tar.gz
openbsd-b6bb75f4585006b28ebc729355536e9e77226c3d.tar.bz2
openbsd-b6bb75f4585006b28ebc729355536e9e77226c3d.zip
Constipate srtp_known_profiles, pushing it into .data.rel.ro
ok tb@ jsing@
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/ssl_tlsext.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_tlsext.c b/src/lib/libssl/ssl_tlsext.c
index 2f6860b6f9..1767104963 100644
--- a/src/lib/libssl/ssl_tlsext.c
+++ b/src/lib/libssl/ssl_tlsext.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_tlsext.c,v 1.83 2020/10/11 01:13:04 guenther Exp $ */ 1/* $OpenBSD: ssl_tlsext.c,v 1.84 2020/10/11 01:16:31 guenther Exp $ */
2/* 2/*
3 * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org>
4 * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> 4 * Copyright (c) 2017 Doug Hogan <doug@openbsd.org>
@@ -1213,7 +1213,7 @@ tlsext_srtp_client_build(SSL *s, uint16_t msg_type, CBB *cbb)
1213 CBB profiles, mki; 1213 CBB profiles, mki;
1214 int ct, i; 1214 int ct, i;
1215 STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = NULL; 1215 STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = NULL;
1216 SRTP_PROTECTION_PROFILE *prof; 1216 const SRTP_PROTECTION_PROFILE *prof;
1217 1217
1218 if ((clnt = SSL_get_srtp_profiles(s)) == NULL) { 1218 if ((clnt = SSL_get_srtp_profiles(s)) == NULL) {
1219 SSLerror(s, SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST); 1219 SSLerror(s, SSL_R_EMPTY_SRTP_PROTECTION_PROFILE_LIST);
@@ -1247,7 +1247,7 @@ tlsext_srtp_client_build(SSL *s, uint16_t msg_type, CBB *cbb)
1247int 1247int
1248tlsext_srtp_server_parse(SSL *s, uint16_t msg_type, CBS *cbs, int *alert) 1248tlsext_srtp_server_parse(SSL *s, uint16_t msg_type, CBS *cbs, int *alert)
1249{ 1249{
1250 SRTP_PROTECTION_PROFILE *cprof, *sprof; 1250 const SRTP_PROTECTION_PROFILE *cprof, *sprof;
1251 STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = NULL, *srvr; 1251 STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = NULL, *srvr;
1252 int i, j; 1252 int i, j;
1253 int ret; 1253 int ret;
@@ -1358,7 +1358,7 @@ int
1358tlsext_srtp_client_parse(SSL *s, uint16_t msg_type, CBS *cbs, int *alert) 1358tlsext_srtp_client_parse(SSL *s, uint16_t msg_type, CBS *cbs, int *alert)
1359{ 1359{
1360 STACK_OF(SRTP_PROTECTION_PROFILE) *clnt; 1360 STACK_OF(SRTP_PROTECTION_PROFILE) *clnt;
1361 SRTP_PROTECTION_PROFILE *prof; 1361 const SRTP_PROTECTION_PROFILE *prof;
1362 int i; 1362 int i;
1363 uint16_t id; 1363 uint16_t id;
1364 CBS profile_ids, mki; 1364 CBS profile_ids, mki;