Bug 1300109 - Move SSLNamedGroup reference to secutil.h, r=franziskus

--HG-- extra : histedit_source : 2d3f7dabfd014803f901e3dbcefee45ba102252e
sailfishos-mirror · Jan 6, 2017 · 94a369f · 94a369f
1 parent 84d8c43
commit 94a369f
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 101 deletions.
diff --git a/cmd/lib/basicutil.c b/cmd/lib/basicutil.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "secoid.h"
-#include "sslt.h"
 
 extern long DER_GetInteger(const SECItem *src);
 
@@ -732,98 +731,3 @@ SECU_SECItemHexStringToBinary(SECItem *srcdest)
     srcdest->len /= 2;
     return SECSuccess;
 }
-
-SSLNamedGroup
-groupNameToNamedGroup(char *name)
-{
-    if (PL_strlen(name) == 4) {
-        if (!strncmp(name, "P256", 4)) {
-            return ssl_grp_ec_secp256r1;
-        }
-        if (!strncmp(name, "P384", 4)) {
-            return ssl_grp_ec_secp384r1;
-        }
-        if (!strncmp(name, "P521", 4)) {
-            return ssl_grp_ec_secp521r1;
-        }
-    }
-    if (PL_strlen(name) == 6) {
-        if (!strncmp(name, "x25519", 6)) {
-            return ssl_grp_ec_curve25519;
-        }
-        if (!strncmp(name, "FF2048", 6)) {
-            return ssl_grp_ffdhe_2048;
-        }
-        if (!strncmp(name, "FF3072", 6)) {
-            return ssl_grp_ffdhe_3072;
-        }
-        if (!strncmp(name, "FF4096", 6)) {
-            return ssl_grp_ffdhe_4096;
-        }
-        if (!strncmp(name, "FF6144", 6)) {
-            return ssl_grp_ffdhe_6144;
-        }
-        if (!strncmp(name, "FF8192", 6)) {
-            return ssl_grp_ffdhe_8192;
-        }
-    }
-
-    return ssl_grp_none;
-}
-
-SECStatus
-parseGroupList(const char *arg, SSLNamedGroup **enabledGroups,
-               unsigned int *enabledGroupsCount)
-{
-    SSLNamedGroup *groups;
-    char *str;
-    char *p;
-    unsigned int numValues = 0;
-    unsigned int count = 0;
-
-    /* Count the number of groups. */
-    str = PORT_Strdup(arg);
-    if (!str) {
-        return SECFailure;
-    }
-    p = strtok(str, ",");
-    while (p) {
-        ++numValues;
-        p = strtok(NULL, ",");
-    }
-    PORT_Free(str);
-    str = NULL;
-    groups = PORT_ZNewArray(SSLNamedGroup, numValues);
-    if (!groups) {
-        goto done;
-    }
-
-    /* Get group names. */
-    str = PORT_Strdup(arg);
-    if (!str) {
-        goto done;
-    }
-    p = strtok(str, ",");
-    while (p) {
-        SSLNamedGroup group = groupNameToNamedGroup(p);
-        if (group == ssl_grp_none) {
-            count = 0;
-            goto done;
-        }
-        groups[count++] = group;
-        p = strtok(NULL, ",");
-    }
-
-done:
-    if (str) {
-        PORT_Free(str);
-    }
-    if (!count) {
-        PORT_Free(groups);
-        return SECFailure;
-    }
-
-    *enabledGroupsCount = count;
-    *enabledGroups = groups;
-    return SECSuccess;
-}
diff --git a/cmd/lib/basicutil.h b/cmd/lib/basicutil.h
@@ -13,7 +13,6 @@
 #include "base64.h"
 #include "secasn1.h"
 #include "secder.h"
-#include "sslt.h"
 #include <stdio.h>
 
 #ifdef SECUTIL_NEW
@@ -113,10 +112,6 @@ SECU_ParseCommandLine(int argc, char **argv, char *progName,
 char *
 SECU_GetOptionArg(const secuCommand *cmd, int optionNum);
 
-SECStatus parseGroupList(const char *arg, SSLNamedGroup **enabledGroups,
-                         unsigned int *enabledGroupsCount);
-SSLNamedGroup groupNameToNamedGroup(char *name);
-
 /*
  *
  *  Error messaging

diff --git a/cmd/lib/secutil.c b/cmd/lib/secutil.c
@@ -3875,3 +3875,98 @@ SECU_HexString2SECItem(PLArenaPool *arena, SECItem *item, const char *str)
 
     return item;
 }
+
+SSLNamedGroup
+groupNameToNamedGroup(char *name)
+{
+    if (PL_strlen(name) == 4) {
+        if (!strncmp(name, "P256", 4)) {
+            return ssl_grp_ec_secp256r1;
+        }
+        if (!strncmp(name, "P384", 4)) {
+            return ssl_grp_ec_secp384r1;
+        }
+        if (!strncmp(name, "P521", 4)) {
+            return ssl_grp_ec_secp521r1;
+        }
+    }
+    if (PL_strlen(name) == 6) {
+        if (!strncmp(name, "x25519", 6)) {
+            return ssl_grp_ec_curve25519;
+        }
+        if (!strncmp(name, "FF2048", 6)) {
+            return ssl_grp_ffdhe_2048;
+        }
+        if (!strncmp(name, "FF3072", 6)) {
+            return ssl_grp_ffdhe_3072;
+        }
+        if (!strncmp(name, "FF4096", 6)) {
+            return ssl_grp_ffdhe_4096;
+        }
+        if (!strncmp(name, "FF6144", 6)) {
+            return ssl_grp_ffdhe_6144;
+        }
+        if (!strncmp(name, "FF8192", 6)) {
+            return ssl_grp_ffdhe_8192;
+        }
+    }
+
+    return ssl_grp_none;
+}
+
+SECStatus
+parseGroupList(const char *arg, SSLNamedGroup **enabledGroups,
+               unsigned int *enabledGroupsCount)
+{
+    SSLNamedGroup *groups;
+    char *str;
+    char *p;
+    unsigned int numValues = 0;
+    unsigned int count = 0;
+
+    /* Count the number of groups. */
+    str = PORT_Strdup(arg);
+    if (!str) {
+        return SECFailure;
+    }
+    p = strtok(str, ",");
+    while (p) {
+        ++numValues;
+        p = strtok(NULL, ",");
+    }
+    PORT_Free(str);
+    str = NULL;
+    groups = PORT_ZNewArray(SSLNamedGroup, numValues);
+    if (!groups) {
+        goto done;
+    }
+
+    /* Get group names. */
+    str = PORT_Strdup(arg);
+    if (!str) {
+        goto done;
+    }
+    p = strtok(str, ",");
+    while (p) {
+        SSLNamedGroup group = groupNameToNamedGroup(p);
+        if (group == ssl_grp_none) {
+            count = 0;
+            goto done;
+        }
+        groups[count++] = group;
+        p = strtok(NULL, ",");
+    }
+
+done:
+    if (str) {
+        PORT_Free(str);
+    }
+    if (!count) {
+        PORT_Free(groups);
+        return SECFailure;
+    }
+
+    *enabledGroupsCount = count;
+    *enabledGroups = groups;
+    return SECSuccess;
+}
diff --git a/cmd/lib/secutil.h b/cmd/lib/secutil.h
@@ -408,6 +408,10 @@ SECU_ParseSSLVersionRangeString(const char *input,
 extern SECItem *SECU_HexString2SECItem(PLArenaPool *arena, SECItem *item,
                                        const char *str);
 
+SECStatus parseGroupList(const char *arg, SSLNamedGroup **enabledGroups,
+                         unsigned int *enabledGroupsCount);
+SSLNamedGroup groupNameToNamedGroup(char *name);
+
 /*
  *
  *  Error messaging