grpc 1.53.0.pre2 → 1.54.0

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

@@ -1,4 +1,3 @@
-/* crypto/x509/by_file.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -65,213 +64,219 @@
 
 #ifndef OPENSSL_NO_STDIO
 
-static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
-                        long argl, char **ret);
+static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, long argl,
+                        char **ret);
 static X509_LOOKUP_METHOD x509_file_lookup = {
     "Load file into cache",
-    NULL,                       /* new */
-    NULL,                       /* free */
-    NULL,                       /* init */
-    NULL,                       /* shutdown */
-    by_file_ctrl,               /* ctrl */
-    NULL,                       /* get_by_subject */
-    NULL,                       /* get_by_issuer_serial */
-    NULL,                       /* get_by_fingerprint */
-    NULL,                       /* get_by_alias */
+    NULL,          // new
+    NULL,          // free
+    NULL,          // init
+    NULL,          // shutdown
+    by_file_ctrl,  // ctrl
+    NULL,          // get_by_subject
 };
 
-X509_LOOKUP_METHOD *X509_LOOKUP_file(void)
-{
-    return (&x509_file_lookup);
-}
+X509_LOOKUP_METHOD *X509_LOOKUP_file(void) { return &x509_file_lookup; }
 
-static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
-                        long argl, char **ret)
-{
-    int ok = 0;
-    const char *file;
+static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
+                        char **ret) {
+  int ok = 0;
+  const char *file;
 
-    switch (cmd) {
+  switch (cmd) {
     case X509_L_FILE_LOAD:
-        if (argl == X509_FILETYPE_DEFAULT) {
-            file = getenv(X509_get_default_cert_file_env());
-            if (file)
-                ok = (X509_load_cert_crl_file(ctx, file,
-                                              X509_FILETYPE_PEM) != 0);
+      if (argl == X509_FILETYPE_DEFAULT) {
+        file = getenv(X509_get_default_cert_file_env());
+        if (file) {
+          ok = (X509_load_cert_crl_file(ctx, file, X509_FILETYPE_PEM) != 0);
+        }
 
-            else
-                ok = (X509_load_cert_crl_file
-                      (ctx, X509_get_default_cert_file(),
-                       X509_FILETYPE_PEM) != 0);
+        else {
+          ok = (X509_load_cert_crl_file(ctx, X509_get_default_cert_file(),
+                                        X509_FILETYPE_PEM) != 0);
+        }
 
-            if (!ok) {
-                OPENSSL_PUT_ERROR(X509, X509_R_LOADING_DEFAULTS);
-            }
+        if (!ok) {
+          OPENSSL_PUT_ERROR(X509, X509_R_LOADING_DEFAULTS);
+        }
+      } else {
+        if (argl == X509_FILETYPE_PEM) {
+          ok = (X509_load_cert_crl_file(ctx, argp, X509_FILETYPE_PEM) != 0);
         } else {
-            if (argl == X509_FILETYPE_PEM)
-                ok = (X509_load_cert_crl_file(ctx, argp,
-                                              X509_FILETYPE_PEM) != 0);
-            else
-                ok = (X509_load_cert_file(ctx, argp, (int)argl) != 0);
+          ok = (X509_load_cert_file(ctx, argp, (int)argl) != 0);
         }
-        break;
-    }
-    return (ok);
+      }
+      break;
+  }
+  return ok;
 }
 
-int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
-{
-    int ret = 0;
-    BIO *in = NULL;
-    int i, count = 0;
-    X509 *x = NULL;
+int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type) {
+  int ret = 0;
+  BIO *in = NULL;
+  int i, count = 0;
+  X509 *x = NULL;
 
-    if (file == NULL)
-        return (1);
-    in = BIO_new(BIO_s_file());
+  in = BIO_new(BIO_s_file());
 
-    if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
-        OPENSSL_PUT_ERROR(X509, ERR_R_SYS_LIB);
-        goto err;
-    }
+  if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
+    OPENSSL_PUT_ERROR(X509, ERR_R_SYS_LIB);
+    goto err;
+  }
 
-    if (type == X509_FILETYPE_PEM) {
-        for (;;) {
-            x = PEM_read_bio_X509_AUX(in, NULL, NULL, NULL);
-            if (x == NULL) {
-                uint32_t error = ERR_peek_last_error();
-                if (ERR_GET_LIB(error) == ERR_LIB_PEM &&
-                    ERR_GET_REASON(error) == PEM_R_NO_START_LINE &&
-                    count > 0) {
-                    ERR_clear_error();
-                    break;
-                }
-                OPENSSL_PUT_ERROR(X509, ERR_R_PEM_LIB);
-                goto err;
-            }
-            i = X509_STORE_add_cert(ctx->store_ctx, x);
-            if (!i)
-                goto err;
-            count++;
-            X509_free(x);
-            x = NULL;
-        }
-        ret = count;
-    } else if (type == X509_FILETYPE_ASN1) {
-        x = d2i_X509_bio(in, NULL);
-        if (x == NULL) {
-            OPENSSL_PUT_ERROR(X509, ERR_R_ASN1_LIB);
-            goto err;
+  if (type == X509_FILETYPE_PEM) {
+    for (;;) {
+      x = PEM_read_bio_X509_AUX(in, NULL, NULL, NULL);
+      if (x == NULL) {
+        uint32_t error = ERR_peek_last_error();
+        if (ERR_GET_LIB(error) == ERR_LIB_PEM &&
+            ERR_GET_REASON(error) == PEM_R_NO_START_LINE && count > 0) {
+          ERR_clear_error();
+          break;
         }
-        i = X509_STORE_add_cert(ctx->store_ctx, x);
-        if (!i)
-            goto err;
-        ret = i;
-    } else {
-        OPENSSL_PUT_ERROR(X509, X509_R_BAD_X509_FILETYPE);
+        OPENSSL_PUT_ERROR(X509, ERR_R_PEM_LIB);
+        goto err;
+      }
+      i = X509_STORE_add_cert(ctx->store_ctx, x);
+      if (!i) {
         goto err;
+      }
+      count++;
+      X509_free(x);
+      x = NULL;
+    }
+    ret = count;
+  } else if (type == X509_FILETYPE_ASN1) {
+    x = d2i_X509_bio(in, NULL);
+    if (x == NULL) {
+      OPENSSL_PUT_ERROR(X509, ERR_R_ASN1_LIB);
+      goto err;
+    }
+    i = X509_STORE_add_cert(ctx->store_ctx, x);
+    if (!i) {
+      goto err;
     }
- err:
-    if (x != NULL)
-        X509_free(x);
-    if (in != NULL)
-        BIO_free(in);
-    return (ret);
+    ret = i;
+  } else {
+    OPENSSL_PUT_ERROR(X509, X509_R_BAD_X509_FILETYPE);
+    goto err;
+  }
+
+  if (ret == 0) {
+    OPENSSL_PUT_ERROR(X509, X509_R_NO_CERTIFICATE_FOUND);
+  }
+
+err:
+  X509_free(x);
+  BIO_free(in);
+  return ret;
 }
 
-int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
-{
-    int ret = 0;
-    BIO *in = NULL;
-    int i, count = 0;
-    X509_CRL *x = NULL;
+int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type) {
+  int ret = 0;
+  BIO *in = NULL;
+  int i, count = 0;
+  X509_CRL *x = NULL;
 
-    if (file == NULL)
-        return (1);
-    in = BIO_new(BIO_s_file());
+  in = BIO_new(BIO_s_file());
 
-    if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
-        OPENSSL_PUT_ERROR(X509, ERR_R_SYS_LIB);
-        goto err;
-    }
+  if ((in == NULL) || (BIO_read_filename(in, file) <= 0)) {
+    OPENSSL_PUT_ERROR(X509, ERR_R_SYS_LIB);
+    goto err;
+  }
 
-    if (type == X509_FILETYPE_PEM) {
-        for (;;) {
-            x = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
-            if (x == NULL) {
-                uint32_t error = ERR_peek_last_error();
-                if (ERR_GET_LIB(error) == ERR_LIB_PEM &&
-                    ERR_GET_REASON(error) == PEM_R_NO_START_LINE &&
-                    count > 0) {
-                    ERR_clear_error();
-                    break;
-                }
-                OPENSSL_PUT_ERROR(X509, ERR_R_PEM_LIB);
-                goto err;
-            }
-            i = X509_STORE_add_crl(ctx->store_ctx, x);
-            if (!i)
-                goto err;
-            count++;
-            X509_CRL_free(x);
-            x = NULL;
+  if (type == X509_FILETYPE_PEM) {
+    for (;;) {
+      x = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
+      if (x == NULL) {
+        uint32_t error = ERR_peek_last_error();
+        if (ERR_GET_LIB(error) == ERR_LIB_PEM &&
+            ERR_GET_REASON(error) == PEM_R_NO_START_LINE && count > 0) {
+          ERR_clear_error();
+          break;
         }
-        ret = count;
-    } else if (type == X509_FILETYPE_ASN1) {
-        x = d2i_X509_CRL_bio(in, NULL);
-        if (x == NULL) {
-            OPENSSL_PUT_ERROR(X509, ERR_R_ASN1_LIB);
-            goto err;
-        }
-        i = X509_STORE_add_crl(ctx->store_ctx, x);
-        if (!i)
-            goto err;
-        ret = i;
-    } else {
-        OPENSSL_PUT_ERROR(X509, X509_R_BAD_X509_FILETYPE);
+        OPENSSL_PUT_ERROR(X509, ERR_R_PEM_LIB);
         goto err;
+      }
+      i = X509_STORE_add_crl(ctx->store_ctx, x);
+      if (!i) {
+        goto err;
+      }
+      count++;
+      X509_CRL_free(x);
+      x = NULL;
+    }
+    ret = count;
+  } else if (type == X509_FILETYPE_ASN1) {
+    x = d2i_X509_CRL_bio(in, NULL);
+    if (x == NULL) {
+      OPENSSL_PUT_ERROR(X509, ERR_R_ASN1_LIB);
+      goto err;
     }
- err:
-    if (x != NULL)
-        X509_CRL_free(x);
-    if (in != NULL)
-        BIO_free(in);
-    return (ret);
+    i = X509_STORE_add_crl(ctx->store_ctx, x);
+    if (!i) {
+      goto err;
+    }
+    ret = i;
+  } else {
+    OPENSSL_PUT_ERROR(X509, X509_R_BAD_X509_FILETYPE);
+    goto err;
+  }
+
+  if (ret == 0) {
+    OPENSSL_PUT_ERROR(X509, X509_R_NO_CRL_FOUND);
+  }
+
+err:
+  X509_CRL_free(x);
+  BIO_free(in);
+  return ret;
 }
 
-int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
-{
-    STACK_OF(X509_INFO) *inf;
-    X509_INFO *itmp;
-    BIO *in;
-    size_t i;
-    int count = 0;
-    if (type != X509_FILETYPE_PEM)
-        return X509_load_cert_file(ctx, file, type);
-    in = BIO_new_file(file, "r");
-    if (!in) {
-        OPENSSL_PUT_ERROR(X509, ERR_R_SYS_LIB);
-        return 0;
-    }
-    inf = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
-    BIO_free(in);
-    if (!inf) {
-        OPENSSL_PUT_ERROR(X509, ERR_R_PEM_LIB);
-        return 0;
+int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type) {
+  STACK_OF(X509_INFO) *inf;
+  X509_INFO *itmp;
+  BIO *in;
+  size_t i;
+  int count = 0;
+
+  if (type != X509_FILETYPE_PEM) {
+    return X509_load_cert_file(ctx, file, type);
+  }
+  in = BIO_new_file(file, "r");
+  if (!in) {
+    OPENSSL_PUT_ERROR(X509, ERR_R_SYS_LIB);
+    return 0;
+  }
+  inf = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
+  BIO_free(in);
+  if (!inf) {
+    OPENSSL_PUT_ERROR(X509, ERR_R_PEM_LIB);
+    return 0;
+  }
+  for (i = 0; i < sk_X509_INFO_num(inf); i++) {
+    itmp = sk_X509_INFO_value(inf, i);
+    if (itmp->x509) {
+      if (!X509_STORE_add_cert(ctx->store_ctx, itmp->x509)) {
+        goto err;
+      }
+      count++;
     }
-    for (i = 0; i < sk_X509_INFO_num(inf); i++) {
-        itmp = sk_X509_INFO_value(inf, i);
-        if (itmp->x509) {
-            X509_STORE_add_cert(ctx->store_ctx, itmp->x509);
-            count++;
-        }
-        if (itmp->crl) {
-            X509_STORE_add_crl(ctx->store_ctx, itmp->crl);
-            count++;
-        }
+    if (itmp->crl) {
+      if (!X509_STORE_add_crl(ctx->store_ctx, itmp->crl)) {
+        goto err;
+      }
+      count++;
     }
-    sk_X509_INFO_pop_free(inf, X509_INFO_free);
-    return count;
+  }
+
+  if (count == 0) {
+    OPENSSL_PUT_ERROR(X509, X509_R_NO_CERTIFICATE_OR_CRL_FOUND);
+  }
+
+err:
+  sk_X509_INFO_pop_free(inf, X509_INFO_free);
+  return count;
 }
 
-#endif                          /* OPENSSL_NO_STDIO */
+#endif  // OPENSSL_NO_STDIO

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

@@ -1,4 +1,3 @@
-/* crypto/asn1/i2d_pr.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -56,28 +55,25 @@
  * [including the GNU Public Licence.] */
 
 #include <openssl/asn1.h>
+#include <openssl/dsa.h>
 #include <openssl/ec_key.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
-#include <openssl/dsa.h>
 
 
-int i2d_PrivateKey(const EVP_PKEY *a, uint8_t **pp)
-{
-    switch (EVP_PKEY_id(a)) {
+int i2d_PrivateKey(const EVP_PKEY *a, uint8_t **pp) {
+  switch (EVP_PKEY_id(a)) {
     case EVP_PKEY_RSA:
-        return i2d_RSAPrivateKey(a->pkey.rsa, pp);
+      return i2d_RSAPrivateKey(EVP_PKEY_get0_RSA(a), pp);
     case EVP_PKEY_EC:
-        return i2d_ECPrivateKey(a->pkey.ec, pp);
+      return i2d_ECPrivateKey(EVP_PKEY_get0_EC_KEY(a), pp);
     case EVP_PKEY_DSA:
-        return i2d_DSAPrivateKey(a->pkey.dsa, pp);
+      return i2d_DSAPrivateKey(EVP_PKEY_get0_DSA(a), pp);
     default:
-        /*
-         * Although this file is in crypto/x509 for layering reasons, it emits
-         * an error code from ASN1 for OpenSSL compatibility.
-         */
-        OPENSSL_PUT_ERROR(ASN1, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
-        return -1;
-    }
+      // Although this file is in crypto/x509 for layering reasons, it emits
+      // an error code from ASN1 for OpenSSL compatibility.
+      OPENSSL_PUT_ERROR(ASN1, ASN1_R_UNSUPPORTED_PUBLIC_KEY_TYPE);
+      return -1;
+  }
 }