commit bc44c089fbd87de0924130453058131ce30cd483
author David Benjamin <davidben@chromium.org> Thu Jan 01 15:02:11 2015 -0500
committer Adam Langley <agl@google.com> Wed Jan 14 22:10:08 2015 +0000
tree 1db28e816a97676313b86686be9c3f343a17cd5a
parent 7ce1c0ca757911f5b55100fda99e0cd20566b831

Store SRTP_PROTECTION_PROFILES as const.

They're small, but they should be read-only. This slightly changes public API
and affects downstream WebRTC code.

Hold on landing this until https://webrtc-codereview.appspot.com/34649004/
rolls into Chromium.

Change-Id: I93cbae20f69d55411d6b1cb62ed7d9a81c83b701
Reviewed-on: https://boringssl-review.googlesource.com/2720
Reviewed-by: Adam Langley <agl@google.com>

ssl/d1_srtp.c

diff --git a/ssl/d1_srtp.c b/ssl/d1_srtp.c
index 96a4593..b85ff9b 100644
--- a/ssl/d1_srtp.c
+++ b/ssl/d1_srtp.c
@@ -124,7 +124,7 @@
 #include <openssl/srtp.h>
 
 
-static SRTP_PROTECTION_PROFILE srtp_known_profiles[] = {
+static const SRTP_PROTECTION_PROFILE srtp_known_profiles[] = {
     {
      "SRTP_AES128_CM_SHA1_80", SRTP_AES128_CM_SHA1_80,
     },
@@ -135,8 +135,9 @@
 };
 
 static int find_profile_by_name(const char *profile_name,
-                                SRTP_PROTECTION_PROFILE **pptr, size_t len) {
-  SRTP_PROTECTION_PROFILE *p;
+                                const SRTP_PROTECTION_PROFILE **pptr,
+                                size_t len) {
+  const SRTP_PROTECTION_PROFILE *p;
 
   p = srtp_known_profiles;
   while (p->name) {
@@ -152,8 +153,8 @@
 }
 
 static int find_profile_by_num(unsigned profile_num,
-                               SRTP_PROTECTION_PROFILE **pptr) {
-  SRTP_PROTECTION_PROFILE *p;
+                               const SRTP_PROTECTION_PROFILE **pptr) {
+  const SRTP_PROTECTION_PROFILE *p;
 
   p = srtp_known_profiles;
   while (p->name) {
@@ -182,7 +183,7 @@
   }
 
   do {
-    SRTP_PROTECTION_PROFILE *p;
+    const SRTP_PROTECTION_PROFILE *p;
 
     col = strchr(ptr, ':');
     if (find_profile_by_name(ptr, &p, col ? col - ptr : strlen(ptr))) {
@@ -227,7 +228,7 @@
   return NULL;
 }
 
-SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s) {
+const SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s) {
   return s->srtp_profile;
 }
 
@@ -246,7 +247,7 @@
   int ct = 0;
   int i;
   STACK_OF(SRTP_PROTECTION_PROFILE) *clnt = 0;
-  SRTP_PROTECTION_PROFILE *prof;
+  const SRTP_PROTECTION_PROFILE *prof;
 
   clnt = SSL_get_srtp_profiles(s);
   ct = sk_SRTP_PROTECTION_PROFILE_num(clnt); /* -1 if clnt == 0 */
@@ -282,7 +283,7 @@
 
 int ssl_parse_clienthello_use_srtp_ext(SSL *s, CBS *cbs, int *out_alert) {
   CBS profile_ids, srtp_mki;
-  SRTP_PROTECTION_PROFILE *cprof, *sprof;
+  const SRTP_PROTECTION_PROFILE *cprof, *sprof;
   STACK_OF(SRTP_PROTECTION_PROFILE) *client_profiles = 0, *server_profiles;
   size_t i, j;
   int ret = 0;
@@ -378,7 +379,7 @@
   size_t i;
 
   STACK_OF(SRTP_PROTECTION_PROFILE) *client_profiles;
-  SRTP_PROTECTION_PROFILE *prof;
+  const SRTP_PROTECTION_PROFILE *prof;
 
   /* The extension consists of a u16-prefixed profile ID list containing a
    * single uint16_t profile ID, then followed by a u8-prefixed srtp_mki field.