grpc 1.53.2 → 1.54.0

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

@@ -1,4 +1,3 @@
-/* crypto/x509/x509_obj.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -67,133 +66,141 @@
 #include "internal.h"
 
 
-/*
- * Limit to ensure we don't overflow: much greater than
- * anything enountered in practice.
- */
-
-#define NAME_ONELINE_MAX    (1024 * 1024)
-
-char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len)
-{
-    X509_NAME_ENTRY *ne;
-    size_t i;
-    int n, lold, l, l1, l2, num, j, type;
-    const char *s;
-    char *p;
-    unsigned char *q;
-    BUF_MEM *b = NULL;
-    static const char hex[17] = "0123456789ABCDEF";
-    int gs_doit[4];
-    char tmp_buf[80];
-
-    if (buf == NULL) {
-        if ((b = BUF_MEM_new()) == NULL)
-            goto err;
-        if (!BUF_MEM_grow(b, 200))
-            goto err;
-        b->data[0] = '\0';
-        len = 200;
-    } else if (len <= 0) {
-        return NULL;
+// Limit to ensure we don't overflow: much greater than
+// anything enountered in practice.
+
+#define NAME_ONELINE_MAX (1024 * 1024)
+
+char *X509_NAME_oneline(const X509_NAME *a, char *buf, int len) {
+  X509_NAME_ENTRY *ne;
+  size_t i;
+  int n, lold, l, l1, l2, num, j, type;
+  const char *s;
+  char *p;
+  unsigned char *q;
+  BUF_MEM *b = NULL;
+  static const char hex[17] = "0123456789ABCDEF";
+  int gs_doit[4];
+  char tmp_buf[80];
+
+  if (buf == NULL) {
+    if ((b = BUF_MEM_new()) == NULL) {
+      goto err;
     }
-    if (a == NULL) {
-        if (b) {
-            buf = b->data;
-            OPENSSL_free(b);
-        }
-        OPENSSL_strlcpy(buf, "NO X509_NAME", len);
-        return buf;
+    if (!BUF_MEM_grow(b, 200)) {
+      goto err;
     }
+    b->data[0] = '\0';
+    len = 200;
+  } else if (len <= 0) {
+    return NULL;
+  }
+  if (a == NULL) {
+    if (b) {
+      buf = b->data;
+      OPENSSL_free(b);
+    }
+    OPENSSL_strlcpy(buf, "NO X509_NAME", len);
+    return buf;
+  }
+
+  len--;  // space for '\0'
+  l = 0;
+  for (i = 0; i < sk_X509_NAME_ENTRY_num(a->entries); i++) {
+    ne = sk_X509_NAME_ENTRY_value(a->entries, i);
+    n = OBJ_obj2nid(ne->object);
+    if ((n == NID_undef) || ((s = OBJ_nid2sn(n)) == NULL)) {
+      i2t_ASN1_OBJECT(tmp_buf, sizeof(tmp_buf), ne->object);
+      s = tmp_buf;
+    }
+    l1 = strlen(s);
 
-    len--;                      /* space for '\0' */
-    l = 0;
-    for (i = 0; i < sk_X509_NAME_ENTRY_num(a->entries); i++) {
-        ne = sk_X509_NAME_ENTRY_value(a->entries, i);
-        n = OBJ_obj2nid(ne->object);
-        if ((n == NID_undef) || ((s = OBJ_nid2sn(n)) == NULL)) {
-            i2t_ASN1_OBJECT(tmp_buf, sizeof(tmp_buf), ne->object);
-            s = tmp_buf;
-        }
-        l1 = strlen(s);
+    type = ne->value->type;
+    num = ne->value->length;
+    if (num > NAME_ONELINE_MAX) {
+      OPENSSL_PUT_ERROR(X509, X509_R_NAME_TOO_LONG);
+      goto err;
+    }
+    q = ne->value->data;
 
-        type = ne->value->type;
-        num = ne->value->length;
-        if (num > NAME_ONELINE_MAX) {
-            OPENSSL_PUT_ERROR(X509, X509_R_NAME_TOO_LONG);
-            goto end;
-        }
-        q = ne->value->data;
-
-        if ((type == V_ASN1_GENERALSTRING) && ((num % 4) == 0)) {
-            gs_doit[0] = gs_doit[1] = gs_doit[2] = gs_doit[3] = 0;
-            for (j = 0; j < num; j++)
-                if (q[j] != 0)
-                    gs_doit[j & 3] = 1;
-
-            if (gs_doit[0] | gs_doit[1] | gs_doit[2])
-                gs_doit[0] = gs_doit[1] = gs_doit[2] = gs_doit[3] = 1;
-            else {
-                gs_doit[0] = gs_doit[1] = gs_doit[2] = 0;
-                gs_doit[3] = 1;
-            }
-        } else
-            gs_doit[0] = gs_doit[1] = gs_doit[2] = gs_doit[3] = 1;
-
-        for (l2 = j = 0; j < num; j++) {
-            if (!gs_doit[j & 3])
-                continue;
-            l2++;
-            if ((q[j] < ' ') || (q[j] > '~'))
-                l2 += 3;
+    if ((type == V_ASN1_GENERALSTRING) && ((num % 4) == 0)) {
+      gs_doit[0] = gs_doit[1] = gs_doit[2] = gs_doit[3] = 0;
+      for (j = 0; j < num; j++) {
+        if (q[j] != 0) {
+          gs_doit[j & 3] = 1;
         }
+      }
+
+      if (gs_doit[0] | gs_doit[1] | gs_doit[2]) {
+        gs_doit[0] = gs_doit[1] = gs_doit[2] = gs_doit[3] = 1;
+      } else {
+        gs_doit[0] = gs_doit[1] = gs_doit[2] = 0;
+        gs_doit[3] = 1;
+      }
+    } else {
+      gs_doit[0] = gs_doit[1] = gs_doit[2] = gs_doit[3] = 1;
+    }
 
-        lold = l;
-        l += 1 + l1 + 1 + l2;
-        if (l > NAME_ONELINE_MAX) {
-            OPENSSL_PUT_ERROR(X509, X509_R_NAME_TOO_LONG);
-            goto end;
-        }
-        if (b != NULL) {
-            if (!BUF_MEM_grow(b, l + 1))
-                goto err;
-            p = &(b->data[lold]);
-        } else if (l > len) {
-            break;
-        } else
-            p = &(buf[lold]);
-        *(p++) = '/';
-        OPENSSL_memcpy(p, s, (unsigned int)l1);
-        p += l1;
-        *(p++) = '=';
-
-        q = ne->value->data;
-
-        for (j = 0; j < num; j++) {
-            if (!gs_doit[j & 3])
-                continue;
-            n = q[j];
-            if ((n < ' ') || (n > '~')) {
-                *(p++) = '\\';
-                *(p++) = 'x';
-                *(p++) = hex[(n >> 4) & 0x0f];
-                *(p++) = hex[n & 0x0f];
-            } else
-                *(p++) = n;
-        }
-        *p = '\0';
+    for (l2 = j = 0; j < num; j++) {
+      if (!gs_doit[j & 3]) {
+        continue;
+      }
+      l2++;
+      if ((q[j] < ' ') || (q[j] > '~')) {
+        l2 += 3;
+      }
+    }
+
+    lold = l;
+    l += 1 + l1 + 1 + l2;
+    if (l > NAME_ONELINE_MAX) {
+      OPENSSL_PUT_ERROR(X509, X509_R_NAME_TOO_LONG);
+      goto err;
     }
     if (b != NULL) {
-        p = b->data;
-        OPENSSL_free(b);
-    } else
-        p = buf;
-    if (i == 0)
-        *p = '\0';
-    return (p);
- err:
-    OPENSSL_PUT_ERROR(X509, ERR_R_MALLOC_FAILURE);
- end:
-    BUF_MEM_free(b);
-    return (NULL);
+      if (!BUF_MEM_grow(b, l + 1)) {
+        goto err;
+      }
+      p = &(b->data[lold]);
+    } else if (l > len) {
+      break;
+    } else {
+      p = &(buf[lold]);
+    }
+    *(p++) = '/';
+    OPENSSL_memcpy(p, s, (unsigned int)l1);
+    p += l1;
+    *(p++) = '=';
+
+    q = ne->value->data;
+
+    for (j = 0; j < num; j++) {
+      if (!gs_doit[j & 3]) {
+        continue;
+      }
+      n = q[j];
+      if ((n < ' ') || (n > '~')) {
+        *(p++) = '\\';
+        *(p++) = 'x';
+        *(p++) = hex[(n >> 4) & 0x0f];
+        *(p++) = hex[n & 0x0f];
+      } else {
+        *(p++) = n;
+      }
+    }
+    *p = '\0';
+  }
+  if (b != NULL) {
+    p = b->data;
+    OPENSSL_free(b);
+  } else {
+    p = buf;
+  }
+  if (i == 0) {
+    *p = '\0';
+  }
+  return p;
+err:
+  BUF_MEM_free(b);
+  return NULL;
 }

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

@@ -1,4 +1,3 @@
-/* crypto/x509/x509_req.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -65,240 +64,175 @@
 #include <openssl/pem.h>
 #include <openssl/x509.h>
 
+#include "../asn1/internal.h"
 #include "internal.h"
 
 
-X509_REQ *X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
-{
-    X509_REQ *ret;
-    X509_REQ_INFO *ri;
-    int i;
-    EVP_PKEY *pktmp;
-
-    ret = X509_REQ_new();
-    if (ret == NULL) {
-        OPENSSL_PUT_ERROR(X509, ERR_R_MALLOC_FAILURE);
-        goto err;
-    }
-
-    ri = ret->req_info;
-
-    ri->version->length = 1;
-    ri->version->data = (unsigned char *)OPENSSL_malloc(1);
-    if (ri->version->data == NULL)
-        goto err;
-    ri->version->data[0] = 0;   /* version == 0 */
-
-    if (!X509_REQ_set_subject_name(ret, X509_get_subject_name(x)))
-        goto err;
-
-    pktmp = X509_get_pubkey(x);
-    if (pktmp == NULL)
-        goto err;
-    i = X509_REQ_set_pubkey(ret, pktmp);
-    EVP_PKEY_free(pktmp);
-    if (!i)
-        goto err;
-
-    if (pkey != NULL) {
-        if (!X509_REQ_sign(ret, pkey, md))
-            goto err;
-    }
-    return (ret);
- err:
-    X509_REQ_free(ret);
-    return (NULL);
-}
-
-long X509_REQ_get_version(const X509_REQ *req)
-{
-    return ASN1_INTEGER_get(req->req_info->version);
+long X509_REQ_get_version(const X509_REQ *req) {
+  return ASN1_INTEGER_get(req->req_info->version);
 }
 
-X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req)
-{
-    return req->req_info->subject;
+X509_NAME *X509_REQ_get_subject_name(const X509_REQ *req) {
+  return req->req_info->subject;
 }
 
-EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req)
-{
-    if ((req == NULL) || (req->req_info == NULL))
-        return (NULL);
-    return (X509_PUBKEY_get(req->req_info->pubkey));
+EVP_PKEY *X509_REQ_get_pubkey(X509_REQ *req) {
+  if ((req == NULL) || (req->req_info == NULL)) {
+    return NULL;
+  }
+  return (X509_PUBKEY_get(req->req_info->pubkey));
 }
 
-int X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k)
-{
-    EVP_PKEY *xk = NULL;
-    int ok = 0;
+int X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k) {
+  EVP_PKEY *xk = NULL;
+  int ok = 0;
 
-    xk = X509_REQ_get_pubkey(x);
-    switch (EVP_PKEY_cmp(xk, k)) {
+  xk = X509_REQ_get_pubkey(x);
+  switch (EVP_PKEY_cmp(xk, k)) {
     case 1:
-        ok = 1;
-        break;
+      ok = 1;
+      break;
     case 0:
-        OPENSSL_PUT_ERROR(X509, X509_R_KEY_VALUES_MISMATCH);
-        break;
+      OPENSSL_PUT_ERROR(X509, X509_R_KEY_VALUES_MISMATCH);
+      break;
     case -1:
-        OPENSSL_PUT_ERROR(X509, X509_R_KEY_TYPE_MISMATCH);
-        break;
+      OPENSSL_PUT_ERROR(X509, X509_R_KEY_TYPE_MISMATCH);
+      break;
     case -2:
-        if (k->type == EVP_PKEY_EC) {
-            OPENSSL_PUT_ERROR(X509, ERR_R_EC_LIB);
-            break;
-        }
-        if (k->type == EVP_PKEY_DH) {
-            /* No idea */
-            OPENSSL_PUT_ERROR(X509, X509_R_CANT_CHECK_DH_KEY);
-            break;
-        }
-        OPENSSL_PUT_ERROR(X509, X509_R_UNKNOWN_KEY_TYPE);
-    }
+      if (EVP_PKEY_id(k) == EVP_PKEY_EC) {
+        OPENSSL_PUT_ERROR(X509, ERR_R_EC_LIB);
+        break;
+      }
+      OPENSSL_PUT_ERROR(X509, X509_R_UNKNOWN_KEY_TYPE);
+  }
 
-    EVP_PKEY_free(xk);
-    return (ok);
+  EVP_PKEY_free(xk);
+  return ok;
 }
 
-int X509_REQ_extension_nid(int req_nid)
-{
-    return req_nid == NID_ext_req || req_nid == NID_ms_ext_req;
+int X509_REQ_extension_nid(int req_nid) {
+  return req_nid == NID_ext_req || req_nid == NID_ms_ext_req;
 }
 
-STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req)
-{
-    if (req == NULL || req->req_info == NULL) {
-        return NULL;
-    }
+STACK_OF(X509_EXTENSION) *X509_REQ_get_extensions(X509_REQ *req) {
+  if (req == NULL || req->req_info == NULL) {
+    return NULL;
+  }
 
-    int idx = X509_REQ_get_attr_by_NID(req, NID_ext_req, -1);
-    if (idx == -1) {
-        idx = X509_REQ_get_attr_by_NID(req, NID_ms_ext_req, -1);
-    }
-    if (idx == -1) {
-        return NULL;
-    }
+  int idx = X509_REQ_get_attr_by_NID(req, NID_ext_req, -1);
+  if (idx == -1) {
+    idx = X509_REQ_get_attr_by_NID(req, NID_ms_ext_req, -1);
+  }
+  if (idx == -1) {
+    return NULL;
+  }
 
-    X509_ATTRIBUTE *attr = X509_REQ_get_attr(req, idx);
-    ASN1_TYPE *ext = X509_ATTRIBUTE_get0_type(attr, 0);
-    if (!ext || ext->type != V_ASN1_SEQUENCE) {
-        return NULL;
-    }
-    const unsigned char *p = ext->value.sequence->data;
-    return (STACK_OF(X509_EXTENSION) *)
-        ASN1_item_d2i(NULL, &p, ext->value.sequence->length,
-                      ASN1_ITEM_rptr(X509_EXTENSIONS));
+  X509_ATTRIBUTE *attr = X509_REQ_get_attr(req, idx);
+  ASN1_TYPE *ext = X509_ATTRIBUTE_get0_type(attr, 0);
+  if (!ext || ext->type != V_ASN1_SEQUENCE) {
+    return NULL;
+  }
+  const unsigned char *p = ext->value.sequence->data;
+  return (STACK_OF(X509_EXTENSION) *)ASN1_item_d2i(
+      NULL, &p, ext->value.sequence->length, ASN1_ITEM_rptr(X509_EXTENSIONS));
 }
 
-/*
- * Add a STACK_OF extensions to a certificate request: allow alternative OIDs
- * in case we want to create a non standard one.
- */
+// Add a STACK_OF extensions to a certificate request: allow alternative OIDs
+// in case we want to create a non standard one.
 
 int X509_REQ_add_extensions_nid(X509_REQ *req,
-                                const STACK_OF(X509_EXTENSION) *exts, int nid)
-{
-    /* Generate encoding of extensions */
-    unsigned char *ext = NULL;
-    int ext_len = ASN1_item_i2d((ASN1_VALUE *)exts, &ext,
-                                ASN1_ITEM_rptr(X509_EXTENSIONS));
-    if (ext_len <= 0) {
-        return 0;
-    }
-    int ret = X509_REQ_add1_attr_by_NID(req, nid, V_ASN1_SEQUENCE, ext,
-                                        ext_len);
-    OPENSSL_free(ext);
-    return ret;
+                                const STACK_OF(X509_EXTENSION) *exts, int nid) {
+  // Generate encoding of extensions
+  unsigned char *ext = NULL;
+  int ext_len =
+      ASN1_item_i2d((ASN1_VALUE *)exts, &ext, ASN1_ITEM_rptr(X509_EXTENSIONS));
+  if (ext_len <= 0) {
+    return 0;
+  }
+  int ret = X509_REQ_add1_attr_by_NID(req, nid, V_ASN1_SEQUENCE, ext, ext_len);
+  OPENSSL_free(ext);
+  return ret;
 }
 
-/* This is the normal usage: use the "official" OID */
+// This is the normal usage: use the "official" OID
 int X509_REQ_add_extensions(X509_REQ *req,
-                            const STACK_OF(X509_EXTENSION) *exts)
-{
-    return X509_REQ_add_extensions_nid(req, exts, NID_ext_req);
+                            const STACK_OF(X509_EXTENSION) *exts) {
+  return X509_REQ_add_extensions_nid(req, exts, NID_ext_req);
 }
 
-/* Request attribute functions */
+// Request attribute functions
 
-int X509_REQ_get_attr_count(const X509_REQ *req)
-{
-    return X509at_get_attr_count(req->req_info->attributes);
+int X509_REQ_get_attr_count(const X509_REQ *req) {
+  return X509at_get_attr_count(req->req_info->attributes);
 }
 
-int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos)
-{
-    return X509at_get_attr_by_NID(req->req_info->attributes, nid, lastpos);
+int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, int lastpos) {
+  return X509at_get_attr_by_NID(req->req_info->attributes, nid, lastpos);
 }
 
 int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj,
-                             int lastpos)
-{
-    return X509at_get_attr_by_OBJ(req->req_info->attributes, obj, lastpos);
+                             int lastpos) {
+  return X509at_get_attr_by_OBJ(req->req_info->attributes, obj, lastpos);
 }
 
-X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc)
-{
-    return X509at_get_attr(req->req_info->attributes, loc);
+X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc) {
+  return X509at_get_attr(req->req_info->attributes, loc);
 }
 
-X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc)
-{
-    return X509at_delete_attr(req->req_info->attributes, loc);
+X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc) {
+  return X509at_delete_attr(req->req_info->attributes, loc);
 }
 
-int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr)
-{
-    if (X509at_add1_attr(&req->req_info->attributes, attr))
-        return 1;
-    return 0;
+int X509_REQ_add1_attr(X509_REQ *req, X509_ATTRIBUTE *attr) {
+  if (X509at_add1_attr(&req->req_info->attributes, attr)) {
+    return 1;
+  }
+  return 0;
 }
 
-int X509_REQ_add1_attr_by_OBJ(X509_REQ *req,
-                              const ASN1_OBJECT *obj, int attrtype,
-                              const unsigned char *data, int len)
-{
-    if (X509at_add1_attr_by_OBJ(&req->req_info->attributes, obj,
-                                attrtype, data, len))
-        return 1;
-    return 0;
+int X509_REQ_add1_attr_by_OBJ(X509_REQ *req, const ASN1_OBJECT *obj,
+                              int attrtype, const unsigned char *data,
+                              int len) {
+  if (X509at_add1_attr_by_OBJ(&req->req_info->attributes, obj, attrtype, data,
+                              len)) {
+    return 1;
+  }
+  return 0;
 }
 
-int X509_REQ_add1_attr_by_NID(X509_REQ *req,
-                              int nid, int attrtype,
-                              const unsigned char *data, int len)
-{
-    if (X509at_add1_attr_by_NID(&req->req_info->attributes, nid,
-                                attrtype, data, len))
-        return 1;
-    return 0;
+int X509_REQ_add1_attr_by_NID(X509_REQ *req, int nid, int attrtype,
+                              const unsigned char *data, int len) {
+  if (X509at_add1_attr_by_NID(&req->req_info->attributes, nid, attrtype, data,
+                              len)) {
+    return 1;
+  }
+  return 0;
 }
 
-int X509_REQ_add1_attr_by_txt(X509_REQ *req,
-                              const char *attrname, int attrtype,
-                              const unsigned char *data, int len)
-{
-    if (X509at_add1_attr_by_txt(&req->req_info->attributes, attrname,
-                                attrtype, data, len))
-        return 1;
-    return 0;
+int X509_REQ_add1_attr_by_txt(X509_REQ *req, const char *attrname, int attrtype,
+                              const unsigned char *data, int len) {
+  if (X509at_add1_attr_by_txt(&req->req_info->attributes, attrname, attrtype,
+                              data, len)) {
+    return 1;
+  }
+  return 0;
 }
 
 void X509_REQ_get0_signature(const X509_REQ *req, const ASN1_BIT_STRING **psig,
-                             const X509_ALGOR **palg)
-{
-    if (psig != NULL)
-        *psig = req->signature;
-    if (palg != NULL)
-        *palg = req->sig_alg;
+                             const X509_ALGOR **palg) {
+  if (psig != NULL) {
+    *psig = req->signature;
+  }
+  if (palg != NULL) {
+    *palg = req->sig_alg;
+  }
 }
 
-int X509_REQ_get_signature_nid(const X509_REQ *req)
-{
-    return OBJ_obj2nid(req->sig_alg->algorithm);
+int X509_REQ_get_signature_nid(const X509_REQ *req) {
+  return OBJ_obj2nid(req->sig_alg->algorithm);
 }
 
-int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp)
-{
-    req->req_info->enc.modified = 1;
-    return i2d_X509_REQ_INFO(req->req_info, pp);
+int i2d_re_X509_REQ_tbs(X509_REQ *req, unsigned char **pp) {
+  asn1_encoding_clear(&req->req_info->enc);
+  return i2d_X509_REQ_INFO(req->req_info, pp);
 }