grpc 1.53.0 → 1.54.2

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

@@ -54,6 +54,8 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.] */
 
+#include <assert.h>
+
 #include <openssl/asn1.h>
 #include <openssl/bio.h>
 #include <openssl/digest.h>
@@ -68,298 +70,271 @@
 
 
 int X509_print_ex_fp(FILE *fp, X509 *x, unsigned long nmflag,
-                     unsigned long cflag)
-{
-    BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
-    if (b == NULL) {
-        OPENSSL_PUT_ERROR(X509, ERR_R_BUF_LIB);
-        return 0;
-    }
-    int ret = X509_print_ex(b, x, nmflag, cflag);
-    BIO_free(b);
-    return ret;
+                     unsigned long cflag) {
+  BIO *b = BIO_new_fp(fp, BIO_NOCLOSE);
+  if (b == NULL) {
+    OPENSSL_PUT_ERROR(X509, ERR_R_BUF_LIB);
+    return 0;
+  }
+  int ret = X509_print_ex(b, x, nmflag, cflag);
+  BIO_free(b);
+  return ret;
 }
 
-int X509_print_fp(FILE *fp, X509 *x)
-{
-    return X509_print_ex_fp(fp, x, XN_FLAG_COMPAT, X509_FLAG_COMPAT);
+int X509_print_fp(FILE *fp, X509 *x) {
+  return X509_print_ex_fp(fp, x, XN_FLAG_COMPAT, X509_FLAG_COMPAT);
 }
 
-int X509_print(BIO *bp, X509 *x)
-{
-    return X509_print_ex(bp, x, XN_FLAG_COMPAT, X509_FLAG_COMPAT);
+int X509_print(BIO *bp, X509 *x) {
+  return X509_print_ex(bp, x, XN_FLAG_COMPAT, X509_FLAG_COMPAT);
 }
 
 int X509_print_ex(BIO *bp, X509 *x, unsigned long nmflags,
-                  unsigned long cflag)
-{
-    long l;
-    int ret = 0, i;
-    char *m = NULL, mlch = ' ';
-    int nmindent = 0;
-    X509_CINF *ci;
-    ASN1_INTEGER *bs;
-    EVP_PKEY *pkey = NULL;
-    const char *neg;
-
-    if ((nmflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) {
-        mlch = '\n';
-        nmindent = 12;
+                  unsigned long cflag) {
+  long l;
+  int ret = 0, i;
+  char *m = NULL, mlch = ' ';
+  int nmindent = 0;
+  X509_CINF *ci;
+  EVP_PKEY *pkey = NULL;
+  const char *neg;
+
+  if ((nmflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) {
+    mlch = '\n';
+    nmindent = 12;
+  }
+
+  if (nmflags == X509_FLAG_COMPAT) {
+    nmindent = 16;
+  }
+
+  ci = x->cert_info;
+  if (!(cflag & X509_FLAG_NO_HEADER)) {
+    if (BIO_write(bp, "Certificate:\n", 13) <= 0) {
+      goto err;
     }
-
-    if (nmflags == X509_FLAG_COMPAT)
-        nmindent = 16;
-
-    ci = x->cert_info;
-    if (!(cflag & X509_FLAG_NO_HEADER)) {
-        if (BIO_write(bp, "Certificate:\n", 13) <= 0)
-            goto err;
-        if (BIO_write(bp, "    Data:\n", 10) <= 0)
-            goto err;
+    if (BIO_write(bp, "    Data:\n", 10) <= 0) {
+      goto err;
     }
-    if (!(cflag & X509_FLAG_NO_VERSION)) {
-        l = X509_get_version(x);
-        if (BIO_printf(bp, "%8sVersion: %lu (0x%lx)\n", "", l + 1, l) <= 0)
-            goto err;
+  }
+  if (!(cflag & X509_FLAG_NO_VERSION)) {
+    l = X509_get_version(x);
+    assert(X509_VERSION_1 <= l && l <= X509_VERSION_3);
+    if (BIO_printf(bp, "%8sVersion: %ld (0x%lx)\n", "", l + 1,
+                   (unsigned long)l) <= 0) {
+      goto err;
+    }
+  }
+  if (!(cflag & X509_FLAG_NO_SERIAL)) {
+    if (BIO_write(bp, "        Serial Number:", 22) <= 0) {
+      goto err;
     }
-    if (!(cflag & X509_FLAG_NO_SERIAL)) {
-
-        if (BIO_write(bp, "        Serial Number:", 22) <= 0)
-            goto err;
 
-        bs = X509_get_serialNumber(x);
-        if (bs->length < (int)sizeof(long)
-            || (bs->length == sizeof(long) && (bs->data[0] & 0x80) == 0)) {
-            l = ASN1_INTEGER_get(bs);
-            if (bs->type == V_ASN1_NEG_INTEGER) {
-                l = -l;
-                neg = "-";
-            } else
-                neg = "";
-            if (BIO_printf(bp, " %s%lu (%s0x%lx)\n", neg, l, neg, l) <= 0)
-                goto err;
-        } else {
-            neg = (bs->type == V_ASN1_NEG_INTEGER) ? " (Negative)" : "";
-            if (BIO_printf(bp, "\n%12s%s", "", neg) <= 0)
-                goto err;
+    const ASN1_INTEGER *serial = X509_get0_serialNumber(x);
+    uint64_t serial_u64;
+    if (ASN1_INTEGER_get_uint64(&serial_u64, serial)) {
+      assert(serial->type != V_ASN1_NEG_INTEGER);
+      if (BIO_printf(bp, " %" PRIu64 " (0x%" PRIx64 ")\n", serial_u64,
+                     serial_u64) <= 0) {
+        goto err;
+      }
+    } else {
+      ERR_clear_error();  // Clear |ASN1_INTEGER_get_uint64|'s error.
+      neg = (serial->type == V_ASN1_NEG_INTEGER) ? " (Negative)" : "";
+      if (BIO_printf(bp, "\n%12s%s", "", neg) <= 0) {
+        goto err;
+      }
 
-            for (i = 0; i < bs->length; i++) {
-                if (BIO_printf(bp, "%02x%c", bs->data[i],
-                               ((i + 1 == bs->length) ? '\n' : ':')) <= 0)
-                    goto err;
-            }
+      for (i = 0; i < serial->length; i++) {
+        if (BIO_printf(bp, "%02x%c", serial->data[i],
+                       ((i + 1 == serial->length) ? '\n' : ':')) <= 0) {
+          goto err;
         }
-
+      }
     }
+  }
 
-    if (!(cflag & X509_FLAG_NO_SIGNAME)) {
-        if (X509_signature_print(bp, ci->signature, NULL) <= 0)
-            goto err;
+  if (!(cflag & X509_FLAG_NO_SIGNAME)) {
+    if (X509_signature_print(bp, ci->signature, NULL) <= 0) {
+      goto err;
     }
+  }
 
-    if (!(cflag & X509_FLAG_NO_ISSUER)) {
-        if (BIO_printf(bp, "        Issuer:%c", mlch) <= 0)
-            goto err;
-        if (X509_NAME_print_ex(bp, X509_get_issuer_name(x), nmindent, nmflags)
-            < 0)
-            goto err;
-        if (BIO_write(bp, "\n", 1) <= 0)
-            goto err;
+  if (!(cflag & X509_FLAG_NO_ISSUER)) {
+    if (BIO_printf(bp, "        Issuer:%c", mlch) <= 0) {
+      goto err;
     }
-    if (!(cflag & X509_FLAG_NO_VALIDITY)) {
-        if (BIO_write(bp, "        Validity\n", 17) <= 0)
-            goto err;
-        if (BIO_write(bp, "            Not Before: ", 24) <= 0)
-            goto err;
-        if (!ASN1_TIME_print(bp, X509_get_notBefore(x)))
-            goto err;
-        if (BIO_write(bp, "\n            Not After : ", 25) <= 0)
-            goto err;
-        if (!ASN1_TIME_print(bp, X509_get_notAfter(x)))
-            goto err;
-        if (BIO_write(bp, "\n", 1) <= 0)
-            goto err;
+    if (X509_NAME_print_ex(bp, X509_get_issuer_name(x), nmindent, nmflags) <
+        0) {
+      goto err;
     }
-    if (!(cflag & X509_FLAG_NO_SUBJECT)) {
-        if (BIO_printf(bp, "        Subject:%c", mlch) <= 0)
-            goto err;
-        if (X509_NAME_print_ex
-            (bp, X509_get_subject_name(x), nmindent, nmflags) < 0)
-            goto err;
-        if (BIO_write(bp, "\n", 1) <= 0)
-            goto err;
+    if (BIO_write(bp, "\n", 1) <= 0) {
+      goto err;
     }
-    if (!(cflag & X509_FLAG_NO_PUBKEY)) {
-        if (BIO_write(bp, "        Subject Public Key Info:\n", 33) <= 0)
-            goto err;
-        if (BIO_printf(bp, "%12sPublic Key Algorithm: ", "") <= 0)
-            goto err;
-        if (i2a_ASN1_OBJECT(bp, ci->key->algor->algorithm) <= 0)
-            goto err;
-        if (BIO_puts(bp, "\n") <= 0)
-            goto err;
-
-        pkey = X509_get_pubkey(x);
-        if (pkey == NULL) {
-            BIO_printf(bp, "%12sUnable to load Public Key\n", "");
-            ERR_print_errors(bp);
-        } else {
-            EVP_PKEY_print_public(bp, pkey, 16, NULL);
-            EVP_PKEY_free(pkey);
-        }
+  }
+  if (!(cflag & X509_FLAG_NO_VALIDITY)) {
+    if (BIO_write(bp, "        Validity\n", 17) <= 0) {
+      goto err;
     }
-
-    if (!(cflag & X509_FLAG_NO_IDS)) {
-        if (ci->issuerUID) {
-            if (BIO_printf(bp, "%8sIssuer Unique ID: ", "") <= 0)
-                goto err;
-            if (!X509_signature_dump(bp, ci->issuerUID, 12))
-                goto err;
-        }
-        if (ci->subjectUID) {
-            if (BIO_printf(bp, "%8sSubject Unique ID: ", "") <= 0)
-                goto err;
-            if (!X509_signature_dump(bp, ci->subjectUID, 12))
-                goto err;
-        }
+    if (BIO_write(bp, "            Not Before: ", 24) <= 0) {
+      goto err;
     }
-
-    if (!(cflag & X509_FLAG_NO_EXTENSIONS))
-        X509V3_extensions_print(bp, "X509v3 extensions",
-                                ci->extensions, cflag, 8);
-
-    if (!(cflag & X509_FLAG_NO_SIGDUMP)) {
-        if (X509_signature_print(bp, x->sig_alg, x->signature) <= 0)
-            goto err;
+    if (!ASN1_TIME_print(bp, X509_get_notBefore(x))) {
+      goto err;
     }
-    if (!(cflag & X509_FLAG_NO_AUX)) {
-        if (!X509_CERT_AUX_print(bp, x->aux, 0))
-            goto err;
+    if (BIO_write(bp, "\n            Not After : ", 25) <= 0) {
+      goto err;
+    }
+    if (!ASN1_TIME_print(bp, X509_get_notAfter(x))) {
+      goto err;
+    }
+    if (BIO_write(bp, "\n", 1) <= 0) {
+      goto err;
+    }
+  }
+  if (!(cflag & X509_FLAG_NO_SUBJECT)) {
+    if (BIO_printf(bp, "        Subject:%c", mlch) <= 0) {
+      goto err;
+    }
+    if (X509_NAME_print_ex(bp, X509_get_subject_name(x), nmindent, nmflags) <
+        0) {
+      goto err;
+    }
+    if (BIO_write(bp, "\n", 1) <= 0) {
+      goto err;
+    }
+  }
+  if (!(cflag & X509_FLAG_NO_PUBKEY)) {
+    if (BIO_write(bp, "        Subject Public Key Info:\n", 33) <= 0) {
+      goto err;
+    }
+    if (BIO_printf(bp, "%12sPublic Key Algorithm: ", "") <= 0) {
+      goto err;
+    }
+    if (i2a_ASN1_OBJECT(bp, ci->key->algor->algorithm) <= 0) {
+      goto err;
+    }
+    if (BIO_puts(bp, "\n") <= 0) {
+      goto err;
     }
-    ret = 1;
- err:
-    if (m != NULL)
-        OPENSSL_free(m);
-    return (ret);
-}
 
-int X509_ocspid_print(BIO *bp, X509 *x)
-{
-    unsigned char *der = NULL;
-    unsigned char *dertmp;
-    int derlen;
-    int i;
-    unsigned char SHA1md[SHA_DIGEST_LENGTH];
+    pkey = X509_get_pubkey(x);
+    if (pkey == NULL) {
+      BIO_printf(bp, "%12sUnable to load Public Key\n", "");
+      ERR_print_errors(bp);
+    } else {
+      EVP_PKEY_print_public(bp, pkey, 16, NULL);
+      EVP_PKEY_free(pkey);
+    }
+  }
 
-    /*
-     * display the hash of the subject as it would appear in OCSP requests
-     */
-    if (BIO_printf(bp, "        Subject OCSP hash: ") <= 0)
-        goto err;
-    derlen = i2d_X509_NAME(x->cert_info->subject, NULL);
-    if ((der = dertmp = (unsigned char *)OPENSSL_malloc(derlen)) == NULL)
+  if (!(cflag & X509_FLAG_NO_IDS)) {
+    if (ci->issuerUID) {
+      if (BIO_printf(bp, "%8sIssuer Unique ID: ", "") <= 0) {
         goto err;
-    i2d_X509_NAME(x->cert_info->subject, &dertmp);
-
-    if (!EVP_Digest(der, derlen, SHA1md, NULL, EVP_sha1(), NULL))
+      }
+      if (!X509_signature_dump(bp, ci->issuerUID, 12)) {
         goto err;
-    for (i = 0; i < SHA_DIGEST_LENGTH; i++) {
-        if (BIO_printf(bp, "%02X", SHA1md[i]) <= 0)
-            goto err;
+      }
     }
-    OPENSSL_free(der);
-    der = NULL;
-
-    /*
-     * display the hash of the public key as it would appear in OCSP requests
-     */
-    if (BIO_printf(bp, "\n        Public key OCSP hash: ") <= 0)
+    if (ci->subjectUID) {
+      if (BIO_printf(bp, "%8sSubject Unique ID: ", "") <= 0) {
         goto err;
-
-    if (!EVP_Digest(x->cert_info->key->public_key->data,
-                    x->cert_info->key->public_key->length,
-                    SHA1md, NULL, EVP_sha1(), NULL))
+      }
+      if (!X509_signature_dump(bp, ci->subjectUID, 12)) {
         goto err;
-    for (i = 0; i < SHA_DIGEST_LENGTH; i++) {
-        if (BIO_printf(bp, "%02X", SHA1md[i]) <= 0)
-            goto err;
+      }
     }
-    BIO_printf(bp, "\n");
-
-    return (1);
- err:
-    if (der != NULL)
-        OPENSSL_free(der);
-    return (0);
-}
+  }
 
-int X509_signature_print(BIO *bp, const X509_ALGOR *sigalg,
-                         const ASN1_STRING *sig)
-{
-    if (BIO_puts(bp, "    Signature Algorithm: ") <= 0)
-        return 0;
-    if (i2a_ASN1_OBJECT(bp, sigalg->algorithm) <= 0)
-        return 0;
+  if (!(cflag & X509_FLAG_NO_EXTENSIONS)) {
+    X509V3_extensions_print(bp, "X509v3 extensions", ci->extensions, cflag, 8);
+  }
 
-    /* RSA-PSS signatures have parameters to print. */
-    int sig_nid = OBJ_obj2nid(sigalg->algorithm);
-    if (sig_nid == NID_rsassaPss &&
-        !x509_print_rsa_pss_params(bp, sigalg, 9, 0)) {
-        return 0;
+  if (!(cflag & X509_FLAG_NO_SIGDUMP)) {
+    if (X509_signature_print(bp, x->sig_alg, x->signature) <= 0) {
+      goto err;
     }
-
-    if (sig)
-        return X509_signature_dump(bp, sig, 9);
-    else if (BIO_puts(bp, "\n") <= 0)
-        return 0;
-    return 1;
+  }
+  if (!(cflag & X509_FLAG_NO_AUX)) {
+    if (!X509_CERT_AUX_print(bp, x->aux, 0)) {
+      goto err;
+    }
+  }
+  ret = 1;
+err:
+  if (m != NULL) {
+    OPENSSL_free(m);
+  }
+  return ret;
 }
 
-int X509_NAME_print(BIO *bp, const X509_NAME *name, int obase)
-{
-    char *s, *c, *b;
-    int ret = 0, l, i;
-
-    l = 80 - 2 - obase;
+int X509_signature_print(BIO *bp, const X509_ALGOR *sigalg,
+                         const ASN1_STRING *sig) {
+  if (BIO_puts(bp, "    Signature Algorithm: ") <= 0) {
+    return 0;
+  }
+  if (i2a_ASN1_OBJECT(bp, sigalg->algorithm) <= 0) {
+    return 0;
+  }
+
+  // RSA-PSS signatures have parameters to print.
+  int sig_nid = OBJ_obj2nid(sigalg->algorithm);
+  if (sig_nid == NID_rsassaPss &&
+      !x509_print_rsa_pss_params(bp, sigalg, 9, 0)) {
+    return 0;
+  }
+
+  if (sig) {
+    return X509_signature_dump(bp, sig, 9);
+  } else if (BIO_puts(bp, "\n") <= 0) {
+    return 0;
+  }
+  return 1;
+}
 
-    b = X509_NAME_oneline(name, NULL, 0);
-    if (!b)
-        return 0;
-    if (!*b) {
-        OPENSSL_free(b);
-        return 1;
-    }
-    s = b + 1;                  /* skip the first slash */
+int X509_NAME_print(BIO *bp, const X509_NAME *name, int obase) {
+  char *s, *c, *b;
+  int ret = 0, i;
 
-    c = s;
-    for (;;) {
-        if (((*s == '/') &&
-             ((s[1] >= 'A') && (s[1] <= 'Z') && ((s[2] == '=') ||
-                                                 ((s[2] >= 'A')
-                                                  && (s[2] <= 'Z')
-                                                  && (s[3] == '='))
-              ))) || (*s == '\0')) {
-            i = s - c;
-            if (BIO_write(bp, c, i) != i)
-                goto err;
-            c = s + 1;          /* skip following slash */
-            if (*s != '\0') {
-                if (BIO_write(bp, ", ", 2) != 2)
-                    goto err;
-            }
-            l--;
+  b = X509_NAME_oneline(name, NULL, 0);
+  if (!b) {
+    return 0;
+  }
+  if (!*b) {
+    OPENSSL_free(b);
+    return 1;
+  }
+  s = b + 1;  // skip the first slash
+
+  c = s;
+  for (;;) {
+    if (((*s == '/') && ((s[1] >= 'A') && (s[1] <= 'Z') &&
+                         ((s[2] == '=') || ((s[2] >= 'A') && (s[2] <= 'Z') &&
+                                            (s[3] == '='))))) ||
+        (*s == '\0')) {
+      i = s - c;
+      if (BIO_write(bp, c, i) != i) {
+        goto err;
+      }
+      c = s + 1;  // skip following slash
+      if (*s != '\0') {
+        if (BIO_write(bp, ", ", 2) != 2) {
+          goto err;
         }
-        if (*s == '\0')
-            break;
-        s++;
-        l--;
+      }
     }
-
-    ret = 1;
-    if (0) {
- err:
-        OPENSSL_PUT_ERROR(X509, ERR_R_BUF_LIB);
+    if (*s == '\0') {
+      break;
     }
-    OPENSSL_free(b);
-    return (ret);
+    s++;
+  }
+
+  ret = 1;
+  if (0) {
+  err:
+    OPENSSL_PUT_ERROR(X509, ERR_R_BUF_LIB);
+  }
+  OPENSSL_free(b);
+  return ret;
 }

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

@@ -63,54 +63,59 @@
 #include "internal.h"
 
 
-/* X509_CERT_AUX and string set routines */
+// X509_CERT_AUX and string set routines
 
-int X509_CERT_AUX_print(BIO *out, X509_CERT_AUX *aux, int indent)
-{
-    char oidstr[80], first;
-    size_t i;
-    int j;
-    if (!aux)
-        return 1;
-    if (aux->trust) {
-        first = 1;
-        BIO_printf(out, "%*sTrusted Uses:\n%*s", indent, "", indent + 2, "");
-        for (i = 0; i < sk_ASN1_OBJECT_num(aux->trust); i++) {
-            if (!first)
-                BIO_puts(out, ", ");
-            else
-                first = 0;
-            OBJ_obj2txt(oidstr, sizeof oidstr,
-                        sk_ASN1_OBJECT_value(aux->trust, i), 0);
-            BIO_puts(out, oidstr);
-        }
-        BIO_puts(out, "\n");
-    } else
-        BIO_printf(out, "%*sNo Trusted Uses.\n", indent, "");
-    if (aux->reject) {
-        first = 1;
-        BIO_printf(out, "%*sRejected Uses:\n%*s", indent, "", indent + 2, "");
-        for (i = 0; i < sk_ASN1_OBJECT_num(aux->reject); i++) {
-            if (!first)
-                BIO_puts(out, ", ");
-            else
-                first = 0;
-            OBJ_obj2txt(oidstr, sizeof oidstr,
-                        sk_ASN1_OBJECT_value(aux->reject, i), 0);
-            BIO_puts(out, oidstr);
-        }
-        BIO_puts(out, "\n");
-    } else
-        BIO_printf(out, "%*sNo Rejected Uses.\n", indent, "");
-    if (aux->alias) {
-        BIO_printf(out, "%*sAlias: %.*s\n", indent, "", aux->alias->length,
-                   aux->alias->data);
+int X509_CERT_AUX_print(BIO *out, X509_CERT_AUX *aux, int indent) {
+  char oidstr[80], first;
+  size_t i;
+  int j;
+  if (!aux) {
+    return 1;
+  }
+  if (aux->trust) {
+    first = 1;
+    BIO_printf(out, "%*sTrusted Uses:\n%*s", indent, "", indent + 2, "");
+    for (i = 0; i < sk_ASN1_OBJECT_num(aux->trust); i++) {
+      if (!first) {
+        BIO_puts(out, ", ");
+      } else {
+        first = 0;
+      }
+      OBJ_obj2txt(oidstr, sizeof oidstr, sk_ASN1_OBJECT_value(aux->trust, i),
+                  0);
+      BIO_puts(out, oidstr);
     }
-    if (aux->keyid) {
-        BIO_printf(out, "%*sKey Id: ", indent, "");
-        for (j = 0; j < aux->keyid->length; j++)
-            BIO_printf(out, "%s%02X", j ? ":" : "", aux->keyid->data[j]);
-        BIO_write(out, "\n", 1);
+    BIO_puts(out, "\n");
+  } else {
+    BIO_printf(out, "%*sNo Trusted Uses.\n", indent, "");
+  }
+  if (aux->reject) {
+    first = 1;
+    BIO_printf(out, "%*sRejected Uses:\n%*s", indent, "", indent + 2, "");
+    for (i = 0; i < sk_ASN1_OBJECT_num(aux->reject); i++) {
+      if (!first) {
+        BIO_puts(out, ", ");
+      } else {
+        first = 0;
+      }
+      OBJ_obj2txt(oidstr, sizeof oidstr, sk_ASN1_OBJECT_value(aux->reject, i),
+                  0);
+      BIO_puts(out, oidstr);
     }
-    return 1;
+    BIO_puts(out, "\n");
+  } else {
+    BIO_printf(out, "%*sNo Rejected Uses.\n", indent, "");
+  }
+  if (aux->alias) {
+    BIO_printf(out, "%*sAlias: %.*s\n", indent, "", aux->alias->length,
+               aux->alias->data);
+  }
+  if (aux->keyid) {
+    BIO_printf(out, "%*sKey Id: ", indent, "");
+    for (j = 0; j < aux->keyid->length; j++) {
+      BIO_printf(out, "%s%02X", j ? ":" : "", aux->keyid->data[j]);
+    }
+    BIO_write(out, "\n", 1);
+  }
+  return 1;
 }

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

@@ -61,8 +61,8 @@
 #include <openssl/mem.h>
 
 
-/* |X509_R_UNSUPPORTED_ALGORITHM| is no longer emitted, but continue to define
- * it to avoid downstream churn. */
+// |X509_R_UNSUPPORTED_ALGORITHM| is no longer emitted, but continue to define
+// it to avoid downstream churn.
 OPENSSL_DECLARE_ERROR_REASON(X509, UNSUPPORTED_ALGORITHM)
 
 int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent) {
@@ -73,8 +73,7 @@ int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent) {
   s = sig->data;
   for (i = 0; i < n; i++) {
     if ((i % 18) == 0) {
-      if (BIO_write(bp, "\n", 1) <= 0 ||
-          BIO_indent(bp, indent, indent) <= 0) {
+      if (BIO_write(bp, "\n", 1) <= 0 || BIO_indent(bp, indent, indent) <= 0) {
         return 0;
       }
     }