more work on CB

[cyrus-sasl.git] / lib / common.c

diff --git a/lib/common.c b/lib/common.c
index 42a0b7b..7827808 100644 (file)
--- a/lib/common.c
+++ b/lib/common.c
@@ -1208,6 +1208,25 @@ int sasl_setprop(sasl_conn_t *conn, int propnum, const void *value)
     else
         ((sasl_client_conn_t *)conn)->cparams->gss_creds = (void *)value;
     break;
+  case SASL_CHANNEL_BINDING: {
+    struct sasl_channel_binding *cb = (struct sasl_channel_binding *)value;
+
+    if (conn->type == SASL_CONN_SERVER) {
+        ((sasl_server_conn_t *)conn)->sparams->chanbindingtype = cb->type;
+        ((sasl_server_conn_t *)conn)->sparams->chanbindingdata = cb->data;
+        ((sasl_server_conn_t *)conn)->sparams->chanbindinglen = cb->len;
+        ((sasl_server_conn_t *)conn)->sparams->chanbindingcrit = cb->critical;
+    } else {
+        ((sasl_client_conn_t *)conn)->cparams->chanbindingtype = cb->type;
+        ((sasl_client_conn_t *)conn)->cparams->chanbindingdata = cb->data;
+        ((sasl_client_conn_t *)conn)->cparams->chanbindinglen = cb->len;
+        if (cb->critical != 0)
+            ((sasl_client_conn_t *)conn)->cparams->chanbindingflags |= SASL_CB_FLAG_CRIT;
+        else
+            ((sasl_client_conn_t *)conn)->cparams->chanbindingflags &= ~(SASL_CB_FLAG_CRIT);
+    }
+    break;
+  }
   default:
       sasl_seterror(conn, 0, "Unknown parameter type");
       result = SASL_BADPARAM;
@@ -2316,6 +2335,24 @@ int sasl_listmech(sasl_conn_t *conn,
     PARAMERROR(conn);
 }
 
+int _sasl_is_equal_mech(const char *req_mech,
+                        const char *plug_mech,
+                        int *plus)
+{
+    size_t len = strlen(req_mech);
+    size_t n;
+
+    if (len > 5 &&
+        strcasecmp(&req_mech[len - 5], "-PLUS") == 0) {
+        n = len - 5;
+        *plus = 1;
+    } else {
+        n = len;
+        *plus = 0;
+    }
+
+    return (strncasecmp(req_mech, plug_mech, n) == 0);
+}
 
 #ifndef WIN32
 static char *