grpc 1.53.0.pre2 → 1.54.0

data/third_party/boringssl-with-bazel/src/crypto/x509/x509name.c

@@ -68,321 +68,325 @@
 
 
 int X509_NAME_get_text_by_NID(const X509_NAME *name, int nid, char *buf,
-                              int len)
-{
-    const ASN1_OBJECT *obj;
-
-    obj = OBJ_nid2obj(nid);
-    if (obj == NULL)
-        return (-1);
-    return (X509_NAME_get_text_by_OBJ(name, obj, buf, len));
+                              int len) {
+  const ASN1_OBJECT *obj;
+
+  obj = OBJ_nid2obj(nid);
+  if (obj == NULL) {
+    return -1;
+  }
+  return (X509_NAME_get_text_by_OBJ(name, obj, buf, len));
 }
 
 int X509_NAME_get_text_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj,
-                              char *buf, int len)
-{
-    int i;
-    ASN1_STRING *data;
-
-    i = X509_NAME_get_index_by_OBJ(name, obj, -1);
-    if (i < 0)
-        return (-1);
-    data = X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, i));
-    i = (data->length > (len - 1)) ? (len - 1) : data->length;
-    if (buf == NULL)
-        return (data->length);
-    OPENSSL_memcpy(buf, data->data, i);
-    buf[i] = '\0';
-    return (i);
+                              char *buf, int len) {
+  int i = X509_NAME_get_index_by_OBJ(name, obj, -1);
+  if (i < 0) {
+    return -1;
+  }
+  const ASN1_STRING *data =
+      X509_NAME_ENTRY_get_data(X509_NAME_get_entry(name, i));
+  i = (data->length > (len - 1)) ? (len - 1) : data->length;
+  if (buf == NULL) {
+    return data->length;
+  }
+  OPENSSL_memcpy(buf, data->data, i);
+  buf[i] = '\0';
+  return i;
 }
 
-int X509_NAME_entry_count(const X509_NAME *name)
-{
-    if (name == NULL)
-        return (0);
-    return (sk_X509_NAME_ENTRY_num(name->entries));
+int X509_NAME_entry_count(const X509_NAME *name) {
+  if (name == NULL) {
+    return 0;
+  }
+  return (sk_X509_NAME_ENTRY_num(name->entries));
 }
 
-int X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos)
-{
-    const ASN1_OBJECT *obj;
+int X509_NAME_get_index_by_NID(const X509_NAME *name, int nid, int lastpos) {
+  const ASN1_OBJECT *obj;
 
-    obj = OBJ_nid2obj(nid);
-    if (obj == NULL)
-        return (-2);
-    return (X509_NAME_get_index_by_OBJ(name, obj, lastpos));
+  obj = OBJ_nid2obj(nid);
+  if (obj == NULL) {
+    return -2;
+  }
+  return (X509_NAME_get_index_by_OBJ(name, obj, lastpos));
 }
 
-/* NOTE: you should be passsing -1, not 0 as lastpos */
+// NOTE: you should be passsing -1, not 0 as lastpos
 int X509_NAME_get_index_by_OBJ(const X509_NAME *name, const ASN1_OBJECT *obj,
-                               int lastpos)
-{
-    int n;
-    X509_NAME_ENTRY *ne;
-    STACK_OF(X509_NAME_ENTRY) *sk;
-
-    if (name == NULL)
-        return (-1);
-    if (lastpos < 0)
-        lastpos = -1;
-    sk = name->entries;
-    n = sk_X509_NAME_ENTRY_num(sk);
-    for (lastpos++; lastpos < n; lastpos++) {
-        ne = sk_X509_NAME_ENTRY_value(sk, lastpos);
-        if (OBJ_cmp(ne->object, obj) == 0)
-            return (lastpos);
+                               int lastpos) {
+  int n;
+  X509_NAME_ENTRY *ne;
+  STACK_OF(X509_NAME_ENTRY) *sk;
+
+  if (name == NULL) {
+    return -1;
+  }
+  if (lastpos < 0) {
+    lastpos = -1;
+  }
+  sk = name->entries;
+  n = sk_X509_NAME_ENTRY_num(sk);
+  for (lastpos++; lastpos < n; lastpos++) {
+    ne = sk_X509_NAME_ENTRY_value(sk, lastpos);
+    if (OBJ_cmp(ne->object, obj) == 0) {
+      return lastpos;
     }
-    return (-1);
+  }
+  return -1;
 }
 
-X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc)
-{
-    if (name == NULL || loc < 0
-        || sk_X509_NAME_ENTRY_num(name->entries) <= (size_t)loc)
-        return (NULL);
-    else
-        return (sk_X509_NAME_ENTRY_value(name->entries, loc));
+X509_NAME_ENTRY *X509_NAME_get_entry(const X509_NAME *name, int loc) {
+  if (name == NULL || loc < 0 ||
+      sk_X509_NAME_ENTRY_num(name->entries) <= (size_t)loc) {
+    return NULL;
+  } else {
+    return (sk_X509_NAME_ENTRY_value(name->entries, loc));
+  }
 }
 
-X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
-{
-    X509_NAME_ENTRY *ret;
-    int i, n, set_prev, set_next;
-    STACK_OF(X509_NAME_ENTRY) *sk;
-
-    if (name == NULL || loc < 0
-        || sk_X509_NAME_ENTRY_num(name->entries) <= (size_t)loc)
-        return (NULL);
-    sk = name->entries;
-    ret = sk_X509_NAME_ENTRY_delete(sk, loc);
-    n = sk_X509_NAME_ENTRY_num(sk);
-    name->modified = 1;
-    if (loc == n)
-        return (ret);
-
-    /* else we need to fixup the set field */
-    if (loc != 0)
-        set_prev = (sk_X509_NAME_ENTRY_value(sk, loc - 1))->set;
-    else
-        set_prev = ret->set - 1;
-    set_next = sk_X509_NAME_ENTRY_value(sk, loc)->set;
-
-    /*
-     * set_prev is the previous set set is the current set set_next is the
-     * following prev 1 1 1 1 1 1 1 1 set 1 1 2 2 next 1 1 2 2 2 2 3 2 so
-     * basically only if prev and next differ by 2, then re-number down by 1
-     */
-    if (set_prev + 1 < set_next)
-        for (i = loc; i < n; i++)
-            sk_X509_NAME_ENTRY_value(sk, i)->set--;
-    return (ret);
+X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc) {
+  if (name == NULL || loc < 0 ||
+      sk_X509_NAME_ENTRY_num(name->entries) <= (size_t)loc) {
+    return NULL;
+  }
+
+  STACK_OF(X509_NAME_ENTRY) *sk = name->entries;
+  X509_NAME_ENTRY *ret = sk_X509_NAME_ENTRY_delete(sk, loc);
+  int n = sk_X509_NAME_ENTRY_num(sk);
+  name->modified = 1;
+  if (loc == n) {
+    return ret;
+  }
+
+  int set_prev;
+  if (loc != 0) {
+    set_prev = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set;
+  } else {
+    set_prev = ret->set - 1;
+  }
+  int set_next = sk_X509_NAME_ENTRY_value(sk, loc)->set;
+
+  // If we removed a singleton RDN, update the RDN indices so they are
+  // consecutive again.
+  if (set_prev + 1 < set_next) {
+    for (int i = loc; i < n; i++) {
+      sk_X509_NAME_ENTRY_value(sk, i)->set--;
+    }
+  }
+  return ret;
 }
 
-int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
-                               const unsigned char *bytes, int len, int loc,
-                               int set)
-{
-    X509_NAME_ENTRY *ne;
-    int ret;
-    ne = X509_NAME_ENTRY_create_by_OBJ(NULL, obj, type, bytes, len);
-    if (!ne)
-        return 0;
-    ret = X509_NAME_add_entry(name, ne, loc, set);
-    X509_NAME_ENTRY_free(ne);
-    return ret;
+int X509_NAME_add_entry_by_OBJ(X509_NAME *name, const ASN1_OBJECT *obj,
+                               int type, const unsigned char *bytes, int len,
+                               int loc, int set) {
+  X509_NAME_ENTRY *ne =
+      X509_NAME_ENTRY_create_by_OBJ(NULL, obj, type, bytes, len);
+  if (!ne) {
+    return 0;
+  }
+  int ret = X509_NAME_add_entry(name, ne, loc, set);
+  X509_NAME_ENTRY_free(ne);
+  return ret;
 }
 
 int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
                                const unsigned char *bytes, int len, int loc,
-                               int set)
-{
-    X509_NAME_ENTRY *ne;
-    int ret;
-    ne = X509_NAME_ENTRY_create_by_NID(NULL, nid, type, bytes, len);
-    if (!ne)
-        return 0;
-    ret = X509_NAME_add_entry(name, ne, loc, set);
-    X509_NAME_ENTRY_free(ne);
-    return ret;
+                               int set) {
+  X509_NAME_ENTRY *ne =
+      X509_NAME_ENTRY_create_by_NID(NULL, nid, type, bytes, len);
+  if (!ne) {
+    return 0;
+  }
+  int ret = X509_NAME_add_entry(name, ne, loc, set);
+  X509_NAME_ENTRY_free(ne);
+  return ret;
 }
 
 int X509_NAME_add_entry_by_txt(X509_NAME *name, const char *field, int type,
                                const unsigned char *bytes, int len, int loc,
-                               int set)
-{
-    X509_NAME_ENTRY *ne;
-    int ret;
-    ne = X509_NAME_ENTRY_create_by_txt(NULL, field, type, bytes, len);
-    if (!ne)
-        return 0;
-    ret = X509_NAME_add_entry(name, ne, loc, set);
-    X509_NAME_ENTRY_free(ne);
-    return ret;
+                               int set) {
+  X509_NAME_ENTRY *ne =
+      X509_NAME_ENTRY_create_by_txt(NULL, field, type, bytes, len);
+  if (!ne) {
+    return 0;
+  }
+  int ret = X509_NAME_add_entry(name, ne, loc, set);
+  X509_NAME_ENTRY_free(ne);
+  return ret;
 }
 
-/*
- * if set is -1, append to previous set, 0 'a new one', and 1, prepend to the
- * guy we are about to stomp on.
- */
-int X509_NAME_add_entry(X509_NAME *name, X509_NAME_ENTRY *ne, int loc,
-                        int set)
-{
-    X509_NAME_ENTRY *new_name = NULL;
-    int n, i, inc;
-    STACK_OF(X509_NAME_ENTRY) *sk;
-
-    if (name == NULL)
-        return (0);
-    sk = name->entries;
-    n = sk_X509_NAME_ENTRY_num(sk);
-    if (loc > n)
-        loc = n;
-    else if (loc < 0)
-        loc = n;
-
-    inc = (set == 0);
-    name->modified = 1;
-
-    if (set == -1) {
-        if (loc == 0) {
-            set = 0;
-            inc = 1;
-        } else {
-            set = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set;
-        }
-    } else {                    /* if (set >= 0) */
-
-        if (loc >= n) {
-            if (loc != 0)
-                set = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set + 1;
-            else
-                set = 0;
-        } else
-            set = sk_X509_NAME_ENTRY_value(sk, loc)->set;
+// if set is -1, append to previous set, 0 'a new one', and 1, prepend to the
+// guy we are about to stomp on.
+int X509_NAME_add_entry(X509_NAME *name, const X509_NAME_ENTRY *entry, int loc,
+                        int set) {
+  X509_NAME_ENTRY *new_name = NULL;
+  int n, i, inc;
+  STACK_OF(X509_NAME_ENTRY) *sk;
+
+  if (name == NULL) {
+    return 0;
+  }
+  sk = name->entries;
+  n = sk_X509_NAME_ENTRY_num(sk);
+  if (loc > n) {
+    loc = n;
+  } else if (loc < 0) {
+    loc = n;
+  }
+
+  inc = (set == 0);
+  name->modified = 1;
+
+  if (set == -1) {
+    if (loc == 0) {
+      set = 0;
+      inc = 1;
+    } else {
+      set = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set;
     }
-
-    if ((new_name = X509_NAME_ENTRY_dup(ne)) == NULL)
-        goto err;
-    new_name->set = set;
-    if (!sk_X509_NAME_ENTRY_insert(sk, new_name, loc)) {
-        OPENSSL_PUT_ERROR(X509, ERR_R_MALLOC_FAILURE);
-        goto err;
+  } else {  // if (set >= 0)
+
+    if (loc >= n) {
+      if (loc != 0) {
+        set = sk_X509_NAME_ENTRY_value(sk, loc - 1)->set + 1;
+      } else {
+        set = 0;
+      }
+    } else {
+      set = sk_X509_NAME_ENTRY_value(sk, loc)->set;
     }
-    if (inc) {
-        n = sk_X509_NAME_ENTRY_num(sk);
-        for (i = loc + 1; i < n; i++)
-            sk_X509_NAME_ENTRY_value(sk, i)->set += 1;
+  }
+
+  if ((new_name = X509_NAME_ENTRY_dup(entry)) == NULL) {
+    goto err;
+  }
+  new_name->set = set;
+  if (!sk_X509_NAME_ENTRY_insert(sk, new_name, loc)) {
+    goto err;
+  }
+  if (inc) {
+    n = sk_X509_NAME_ENTRY_num(sk);
+    for (i = loc + 1; i < n; i++) {
+      sk_X509_NAME_ENTRY_value(sk, i)->set += 1;
     }
-    return (1);
- err:
-    if (new_name != NULL)
-        X509_NAME_ENTRY_free(new_name);
-    return (0);
+  }
+  return 1;
+err:
+  if (new_name != NULL) {
+    X509_NAME_ENTRY_free(new_name);
+  }
+  return 0;
 }
 
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
                                                const char *field, int type,
                                                const unsigned char *bytes,
-                                               int len)
-{
-    ASN1_OBJECT *obj;
-    X509_NAME_ENTRY *nentry;
-
-    obj = OBJ_txt2obj(field, 0);
-    if (obj == NULL) {
-        OPENSSL_PUT_ERROR(X509, X509_R_INVALID_FIELD_NAME);
-        ERR_add_error_data(2, "name=", field);
-        return (NULL);
-    }
-    nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
-    ASN1_OBJECT_free(obj);
-    return nentry;
+                                               int len) {
+  ASN1_OBJECT *obj;
+  X509_NAME_ENTRY *nentry;
+
+  obj = OBJ_txt2obj(field, 0);
+  if (obj == NULL) {
+    OPENSSL_PUT_ERROR(X509, X509_R_INVALID_FIELD_NAME);
+    ERR_add_error_data(2, "name=", field);
+    return NULL;
+  }
+  nentry = X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
+  ASN1_OBJECT_free(obj);
+  return nentry;
 }
 
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
                                                int type,
                                                const unsigned char *bytes,
-                                               int len)
-{
-    const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
-    if (obj == NULL) {
-        OPENSSL_PUT_ERROR(X509, X509_R_UNKNOWN_NID);
-        return NULL;
-    }
-    return X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
+                                               int len) {
+  const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
+  if (obj == NULL) {
+    OPENSSL_PUT_ERROR(X509, X509_R_UNKNOWN_NID);
+    return NULL;
+  }
+  return X509_NAME_ENTRY_create_by_OBJ(ne, obj, type, bytes, len);
 }
 
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_OBJ(X509_NAME_ENTRY **ne,
-                                               const ASN1_OBJECT *obj,
-                                               int type,
+                                               const ASN1_OBJECT *obj, int type,
                                                const unsigned char *bytes,
-                                               int len)
-{
-    X509_NAME_ENTRY *ret;
-
-    if ((ne == NULL) || (*ne == NULL)) {
-        if ((ret = X509_NAME_ENTRY_new()) == NULL)
-            return (NULL);
-    } else
-        ret = *ne;
-
-    if (!X509_NAME_ENTRY_set_object(ret, obj))
-        goto err;
-    if (!X509_NAME_ENTRY_set_data(ret, type, bytes, len))
-        goto err;
-
-    if ((ne != NULL) && (*ne == NULL))
-        *ne = ret;
-    return (ret);
- err:
-    if ((ne == NULL) || (ret != *ne))
-        X509_NAME_ENTRY_free(ret);
-    return (NULL);
-}
+                                               int len) {
+  X509_NAME_ENTRY *ret;
 
-int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj)
-{
-    if ((ne == NULL) || (obj == NULL)) {
-        OPENSSL_PUT_ERROR(X509, ERR_R_PASSED_NULL_PARAMETER);
-        return (0);
+  if ((ne == NULL) || (*ne == NULL)) {
+    if ((ret = X509_NAME_ENTRY_new()) == NULL) {
+      return NULL;
     }
-    ASN1_OBJECT_free(ne->object);
-    ne->object = OBJ_dup(obj);
-    return ((ne->object == NULL) ? 0 : 1);
+  } else {
+    ret = *ne;
+  }
+
+  if (!X509_NAME_ENTRY_set_object(ret, obj)) {
+    goto err;
+  }
+  if (!X509_NAME_ENTRY_set_data(ret, type, bytes, len)) {
+    goto err;
+  }
+
+  if ((ne != NULL) && (*ne == NULL)) {
+    *ne = ret;
+  }
+  return ret;
+err:
+  if ((ne == NULL) || (ret != *ne)) {
+    X509_NAME_ENTRY_free(ret);
+  }
+  return NULL;
+}
+
+int X509_NAME_ENTRY_set_object(X509_NAME_ENTRY *ne, const ASN1_OBJECT *obj) {
+  if ((ne == NULL) || (obj == NULL)) {
+    OPENSSL_PUT_ERROR(X509, ERR_R_PASSED_NULL_PARAMETER);
+    return 0;
+  }
+  ASN1_OBJECT_free(ne->object);
+  ne->object = OBJ_dup(obj);
+  return ((ne->object == NULL) ? 0 : 1);
 }
 
 int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *ne, int type,
-                             const unsigned char *bytes, int len)
-{
-    int i;
-
-    if ((ne == NULL) || ((bytes == NULL) && (len != 0)))
-        return (0);
-    if ((type > 0) && (type & MBSTRING_FLAG))
-        return ASN1_STRING_set_by_NID(&ne->value, bytes,
-                                      len, type,
-                                      OBJ_obj2nid(ne->object)) ? 1 : 0;
-    if (len < 0)
-        len = strlen((const char *)bytes);
-    i = ASN1_STRING_set(ne->value, bytes, len);
-    if (!i)
-        return (0);
-    if (type != V_ASN1_UNDEF) {
-        ne->value->type = type;
-    }
-    return (1);
+                             const unsigned char *bytes, int len) {
+  int i;
+
+  if ((ne == NULL) || ((bytes == NULL) && (len != 0))) {
+    return 0;
+  }
+  if ((type > 0) && (type & MBSTRING_FLAG)) {
+    return ASN1_STRING_set_by_NID(&ne->value, bytes, len, type,
+                                  OBJ_obj2nid(ne->object))
+               ? 1
+               : 0;
+  }
+  if (len < 0) {
+    len = strlen((const char *)bytes);
+  }
+  i = ASN1_STRING_set(ne->value, bytes, len);
+  if (!i) {
+    return 0;
+  }
+  if (type != V_ASN1_UNDEF) {
+    ne->value->type = type;
+  }
+  return 1;
 }
 
-ASN1_OBJECT *X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne)
-{
-    if (ne == NULL)
-        return (NULL);
-    return (ne->object);
+ASN1_OBJECT *X509_NAME_ENTRY_get_object(const X509_NAME_ENTRY *ne) {
+  if (ne == NULL) {
+    return NULL;
+  }
+  return ne->object;
 }
 
-ASN1_STRING *X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne)
-{
-    if (ne == NULL)
-        return (NULL);
-    return (ne->value);
+ASN1_STRING *X509_NAME_ENTRY_get_data(const X509_NAME_ENTRY *ne) {
+  if (ne == NULL) {
+    return NULL;
+  }
+  return ne->value;
 }

data/third_party/boringssl-with-bazel/src/crypto/x509/x509rset.c

@@ -62,23 +62,48 @@
 #include "internal.h"
 
 
-int X509_REQ_set_version(X509_REQ *x, long version)
-{
-    if (x == NULL)
-        return (0);
-    return (ASN1_INTEGER_set(x->req_info->version, version));
+int X509_REQ_set_version(X509_REQ *x, long version) {
+  if (x == NULL) {
+    return 0;
+  }
+  if (version != X509_REQ_VERSION_1) {
+    OPENSSL_PUT_ERROR(X509, X509_R_INVALID_VERSION);
+    return 0;
+  }
+  return ASN1_INTEGER_set_int64(x->req_info->version, version);
 }
 
-int X509_REQ_set_subject_name(X509_REQ *x, X509_NAME *name)
-{
-    if ((x == NULL) || (x->req_info == NULL))
-        return (0);
-    return (X509_NAME_set(&x->req_info->subject, name));
+int X509_REQ_set_subject_name(X509_REQ *x, X509_NAME *name) {
+  if ((x == NULL) || (x->req_info == NULL)) {
+    return 0;
+  }
+  return (X509_NAME_set(&x->req_info->subject, name));
 }
 
-int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey)
-{
-    if ((x == NULL) || (x->req_info == NULL))
-        return (0);
-    return (X509_PUBKEY_set(&x->req_info->pubkey, pkey));
+int X509_REQ_set_pubkey(X509_REQ *x, EVP_PKEY *pkey) {
+  if ((x == NULL) || (x->req_info == NULL)) {
+    return 0;
+  }
+  return (X509_PUBKEY_set(&x->req_info->pubkey, pkey));
+}
+
+int X509_REQ_set1_signature_algo(X509_REQ *req, const X509_ALGOR *algo) {
+  X509_ALGOR *copy = X509_ALGOR_dup(algo);
+  if (copy == NULL) {
+    return 0;
+  }
+
+  X509_ALGOR_free(req->sig_alg);
+  req->sig_alg = copy;
+  return 1;
+}
+
+int X509_REQ_set1_signature_value(X509_REQ *req, const uint8_t *sig,
+                                  size_t sig_len) {
+  if (!ASN1_STRING_set(req->signature, sig, sig_len)) {
+    return 0;
+  }
+  req->signature->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
+  req->signature->flags |= ASN1_STRING_FLAG_BITS_LEFT;
+  return 1;
 }