@fails-components/webtransport 0.0.1 → 0.0.2

package/third_party/boringssl/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;
 }

package/third_party/boringssl/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;
       }
     }

package/third_party/boringssl/src/crypto/x509/x509_att.c

@@ -66,293 +66,304 @@
 #include "internal.h"
 
 
-int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x)
-{
-    return sk_X509_ATTRIBUTE_num(x);
+int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x) {
+  return sk_X509_ATTRIBUTE_num(x);
 }
 
 int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid,
-                           int lastpos)
-{
-    const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
-    if (obj == NULL) {
-        return -1;
-    }
-    return X509at_get_attr_by_OBJ(x, obj, lastpos);
+                           int lastpos) {
+  const ASN1_OBJECT *obj = OBJ_nid2obj(nid);
+  if (obj == NULL) {
+    return -1;
+  }
+  return X509at_get_attr_by_OBJ(x, obj, lastpos);
 }
 
 int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk,
-                           const ASN1_OBJECT *obj, int lastpos)
-{
-    int n;
-    X509_ATTRIBUTE *ex;
+                           const ASN1_OBJECT *obj, int lastpos) {
+  int n;
+  X509_ATTRIBUTE *ex;
 
-    if (sk == NULL)
-        return (-1);
-    lastpos++;
-    if (lastpos < 0)
-        lastpos = 0;
-    n = sk_X509_ATTRIBUTE_num(sk);
-    for (; lastpos < n; lastpos++) {
-        ex = sk_X509_ATTRIBUTE_value(sk, lastpos);
-        if (OBJ_cmp(ex->object, obj) == 0)
-            return (lastpos);
+  if (sk == NULL) {
+    return -1;
+  }
+  lastpos++;
+  if (lastpos < 0) {
+    lastpos = 0;
+  }
+  n = sk_X509_ATTRIBUTE_num(sk);
+  for (; lastpos < n; lastpos++) {
+    ex = sk_X509_ATTRIBUTE_value(sk, lastpos);
+    if (OBJ_cmp(ex->object, obj) == 0) {
+      return lastpos;
     }
-    return (-1);
+  }
+  return -1;
 }
 
-X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc)
-{
-    if (x == NULL || loc < 0 || sk_X509_ATTRIBUTE_num(x) <= (size_t)loc)
-        return NULL;
-    else
-        return sk_X509_ATTRIBUTE_value(x, loc);
+X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc) {
+  if (x == NULL || loc < 0 || sk_X509_ATTRIBUTE_num(x) <= (size_t)loc) {
+    return NULL;
+  } else {
+    return sk_X509_ATTRIBUTE_value(x, loc);
+  }
 }
 
-X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc)
-{
-    X509_ATTRIBUTE *ret;
+X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc) {
+  X509_ATTRIBUTE *ret;
 
-    if (x == NULL || loc < 0 || sk_X509_ATTRIBUTE_num(x) <= (size_t)loc)
-        return (NULL);
-    ret = sk_X509_ATTRIBUTE_delete(x, loc);
-    return (ret);
+  if (x == NULL || loc < 0 || sk_X509_ATTRIBUTE_num(x) <= (size_t)loc) {
+    return NULL;
+  }
+  ret = sk_X509_ATTRIBUTE_delete(x, loc);
+  return ret;
 }
 
 STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x,
-                                           X509_ATTRIBUTE *attr)
-{
-    X509_ATTRIBUTE *new_attr = NULL;
-    STACK_OF(X509_ATTRIBUTE) *sk = NULL;
+                                           X509_ATTRIBUTE *attr) {
+  X509_ATTRIBUTE *new_attr = NULL;
+  STACK_OF(X509_ATTRIBUTE) *sk = NULL;
 
-    if (x == NULL) {
-        OPENSSL_PUT_ERROR(X509, ERR_R_PASSED_NULL_PARAMETER);
-        goto err2;
-    }
+  if (x == NULL) {
+    OPENSSL_PUT_ERROR(X509, ERR_R_PASSED_NULL_PARAMETER);
+    goto err2;
+  }
 
-    if (*x == NULL) {
-        if ((sk = sk_X509_ATTRIBUTE_new_null()) == NULL)
-            goto err;
-    } else
-        sk = *x;
+  if (*x == NULL) {
+    if ((sk = sk_X509_ATTRIBUTE_new_null()) == NULL) {
+      goto err;
+    }
+  } else {
+    sk = *x;
+  }
 
-    if ((new_attr = X509_ATTRIBUTE_dup(attr)) == NULL)
-        goto err2;
-    if (!sk_X509_ATTRIBUTE_push(sk, new_attr))
-        goto err;
-    if (*x == NULL)
-        *x = sk;
-    return (sk);
- err:
-    OPENSSL_PUT_ERROR(X509, ERR_R_MALLOC_FAILURE);
- err2:
-    if (new_attr != NULL)
-        X509_ATTRIBUTE_free(new_attr);
-    if (sk != NULL)
-        sk_X509_ATTRIBUTE_free(sk);
-    return (NULL);
+  if ((new_attr = X509_ATTRIBUTE_dup(attr)) == NULL) {
+    goto err2;
+  }
+  if (!sk_X509_ATTRIBUTE_push(sk, new_attr)) {
+    goto err;
+  }
+  if (*x == NULL) {
+    *x = sk;
+  }
+  return sk;
+err:
+  OPENSSL_PUT_ERROR(X509, ERR_R_MALLOC_FAILURE);
+err2:
+  if (new_attr != NULL) {
+    X509_ATTRIBUTE_free(new_attr);
+  }
+  if (sk != NULL) {
+    sk_X509_ATTRIBUTE_free(sk);
+  }
+  return NULL;
 }
 
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, const ASN1_OBJECT *obj,
+STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_OBJ(STACK_OF(X509_ATTRIBUTE) **x,
+                                                  const ASN1_OBJECT *obj,
                                                   int type,
                                                   const unsigned char *bytes,
-                                                  int len)
-{
-    X509_ATTRIBUTE *attr;
-    STACK_OF(X509_ATTRIBUTE) *ret;
-    attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, type, bytes, len);
-    if (!attr)
-        return 0;
-    ret = X509at_add1_attr(x, attr);
-    X509_ATTRIBUTE_free(attr);
-    return ret;
+                                                  int len) {
+  X509_ATTRIBUTE *attr;
+  STACK_OF(X509_ATTRIBUTE) *ret;
+  attr = X509_ATTRIBUTE_create_by_OBJ(NULL, obj, type, bytes, len);
+  if (!attr) {
+    return 0;
+  }
+  ret = X509at_add1_attr(x, attr);
+  X509_ATTRIBUTE_free(attr);
+  return ret;
 }
 
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, int nid, int type,
+STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_NID(STACK_OF(X509_ATTRIBUTE) **x,
+                                                  int nid, int type,
                                                   const unsigned char *bytes,
-                                                  int len)
-{
-    X509_ATTRIBUTE *attr;
-    STACK_OF(X509_ATTRIBUTE) *ret;
-    attr = X509_ATTRIBUTE_create_by_NID(NULL, nid, type, bytes, len);
-    if (!attr)
-        return 0;
-    ret = X509at_add1_attr(x, attr);
-    X509_ATTRIBUTE_free(attr);
-    return ret;
+                                                  int len) {
+  X509_ATTRIBUTE *attr;
+  STACK_OF(X509_ATTRIBUTE) *ret;
+  attr = X509_ATTRIBUTE_create_by_NID(NULL, nid, type, bytes, len);
+  if (!attr) {
+    return 0;
+  }
+  ret = X509at_add1_attr(x, attr);
+  X509_ATTRIBUTE_free(attr);
+  return ret;
 }
 
-STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE)
-                                                  **x, const char *attrname,
+STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x,
+                                                  const char *attrname,
                                                   int type,
                                                   const unsigned char *bytes,
-                                                  int len)
-{
-    X509_ATTRIBUTE *attr;
-    STACK_OF(X509_ATTRIBUTE) *ret;
-    attr = X509_ATTRIBUTE_create_by_txt(NULL, attrname, type, bytes, len);
-    if (!attr)
-        return 0;
-    ret = X509at_add1_attr(x, attr);
-    X509_ATTRIBUTE_free(attr);
-    return ret;
+                                                  int len) {
+  X509_ATTRIBUTE *attr;
+  STACK_OF(X509_ATTRIBUTE) *ret;
+  attr = X509_ATTRIBUTE_create_by_txt(NULL, attrname, type, bytes, len);
+  if (!attr) {
+    return 0;
+  }
+  ret = X509at_add1_attr(x, attr);
+  X509_ATTRIBUTE_free(attr);
+  return ret;
 }
 
 X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
                                              int attrtype, const void *data,
-                                             int len)
-{
-    const ASN1_OBJECT *obj;
+                                             int len) {
+  const ASN1_OBJECT *obj;
 
-    obj = OBJ_nid2obj(nid);
-    if (obj == NULL) {
-        OPENSSL_PUT_ERROR(X509, X509_R_UNKNOWN_NID);
-        return (NULL);
-    }
-    return X509_ATTRIBUTE_create_by_OBJ(attr, obj, attrtype, data, len);
+  obj = OBJ_nid2obj(nid);
+  if (obj == NULL) {
+    OPENSSL_PUT_ERROR(X509, X509_R_UNKNOWN_NID);
+    return NULL;
+  }
+  return X509_ATTRIBUTE_create_by_OBJ(attr, obj, attrtype, data, len);
 }
 
 X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,
                                              const ASN1_OBJECT *obj,
                                              int attrtype, const void *data,
-                                             int len)
-{
-    X509_ATTRIBUTE *ret;
+                                             int len) {
+  X509_ATTRIBUTE *ret;
 
-    if ((attr == NULL) || (*attr == NULL)) {
-        if ((ret = X509_ATTRIBUTE_new()) == NULL) {
-            OPENSSL_PUT_ERROR(X509, ERR_R_MALLOC_FAILURE);
-            return (NULL);
-        }
-    } else
-        ret = *attr;
+  if ((attr == NULL) || (*attr == NULL)) {
+    if ((ret = X509_ATTRIBUTE_new()) == NULL) {
+      OPENSSL_PUT_ERROR(X509, ERR_R_MALLOC_FAILURE);
+      return NULL;
+    }
+  } else {
+    ret = *attr;
+  }
 
-    if (!X509_ATTRIBUTE_set1_object(ret, obj))
-        goto err;
-    if (!X509_ATTRIBUTE_set1_data(ret, attrtype, data, len))
-        goto err;
+  if (!X509_ATTRIBUTE_set1_object(ret, obj)) {
+    goto err;
+  }
+  if (!X509_ATTRIBUTE_set1_data(ret, attrtype, data, len)) {
+    goto err;
+  }
 
-    if ((attr != NULL) && (*attr == NULL))
-        *attr = ret;
-    return (ret);
- err:
-    if ((attr == NULL) || (ret != *attr))
-        X509_ATTRIBUTE_free(ret);
-    return (NULL);
+  if ((attr != NULL) && (*attr == NULL)) {
+    *attr = ret;
+  }
+  return ret;
+err:
+  if ((attr == NULL) || (ret != *attr)) {
+    X509_ATTRIBUTE_free(ret);
+  }
+  return NULL;
 }
 
 X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_txt(X509_ATTRIBUTE **attr,
                                              const char *attrname, int type,
                                              const unsigned char *bytes,
-                                             int len)
-{
-    ASN1_OBJECT *obj;
-    X509_ATTRIBUTE *nattr;
+                                             int len) {
+  ASN1_OBJECT *obj;
+  X509_ATTRIBUTE *nattr;
 
-    obj = OBJ_txt2obj(attrname, 0);
-    if (obj == NULL) {
-        OPENSSL_PUT_ERROR(X509, X509_R_INVALID_FIELD_NAME);
-        ERR_add_error_data(2, "name=", attrname);
-        return (NULL);
-    }
-    nattr = X509_ATTRIBUTE_create_by_OBJ(attr, obj, type, bytes, len);
-    ASN1_OBJECT_free(obj);
-    return nattr;
+  obj = OBJ_txt2obj(attrname, 0);
+  if (obj == NULL) {
+    OPENSSL_PUT_ERROR(X509, X509_R_INVALID_FIELD_NAME);
+    ERR_add_error_data(2, "name=", attrname);
+    return NULL;
+  }
+  nattr = X509_ATTRIBUTE_create_by_OBJ(attr, obj, type, bytes, len);
+  ASN1_OBJECT_free(obj);
+  return nattr;
 }
 
-int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj)
-{
-    if ((attr == NULL) || (obj == NULL))
-        return (0);
-    ASN1_OBJECT_free(attr->object);
-    attr->object = OBJ_dup(obj);
-    return attr->object != NULL;
+int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj) {
+  if ((attr == NULL) || (obj == NULL)) {
+    return 0;
+  }
+  ASN1_OBJECT_free(attr->object);
+  attr->object = OBJ_dup(obj);
+  return attr->object != NULL;
 }
 
 int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype,
-                             const void *data, int len)
-{
-    ASN1_TYPE *ttmp = NULL;
-    ASN1_STRING *stmp = NULL;
-    int atype = 0;
-    if (!attr)
-        return 0;
-    if (attrtype & MBSTRING_FLAG) {
-        stmp = ASN1_STRING_set_by_NID(NULL, data, len, attrtype,
-                                      OBJ_obj2nid(attr->object));
-        if (!stmp) {
-            OPENSSL_PUT_ERROR(X509, ERR_R_ASN1_LIB);
-            return 0;
-        }
-        atype = stmp->type;
-    } else if (len != -1) {
-        if (!(stmp = ASN1_STRING_type_new(attrtype)))
-            goto err;
-        if (!ASN1_STRING_set(stmp, data, len))
-            goto err;
-        atype = attrtype;
+                             const void *data, int len) {
+  ASN1_TYPE *ttmp = NULL;
+  ASN1_STRING *stmp = NULL;
+  int atype = 0;
+  if (!attr) {
+    return 0;
+  }
+  if (attrtype & MBSTRING_FLAG) {
+    stmp = ASN1_STRING_set_by_NID(NULL, data, len, attrtype,
+                                  OBJ_obj2nid(attr->object));
+    if (!stmp) {
+      OPENSSL_PUT_ERROR(X509, ERR_R_ASN1_LIB);
+      return 0;
     }
-    /*
-     * This is a bit naughty because the attribute should really have at
-     * least one value but some types use and zero length SET and require
-     * this.
-     */
-    if (attrtype == 0) {
-        ASN1_STRING_free(stmp);
-        return 1;
+    atype = stmp->type;
+  } else if (len != -1) {
+    if (!(stmp = ASN1_STRING_type_new(attrtype))) {
+      goto err;
     }
-    if (!(ttmp = ASN1_TYPE_new()))
-        goto err;
-    if ((len == -1) && !(attrtype & MBSTRING_FLAG)) {
-        if (!ASN1_TYPE_set1(ttmp, attrtype, data))
-            goto err;
-    } else {
-        ASN1_TYPE_set(ttmp, atype, stmp);
-        stmp = NULL;
+    if (!ASN1_STRING_set(stmp, data, len)) {
+      goto err;
     }
-    if (!sk_ASN1_TYPE_push(attr->set, ttmp))
-        goto err;
-    return 1;
- err:
-    OPENSSL_PUT_ERROR(X509, ERR_R_MALLOC_FAILURE);
-    ASN1_TYPE_free(ttmp);
+    atype = attrtype;
+  }
+  // This is a bit naughty because the attribute should really have at
+  // least one value but some types use and zero length SET and require
+  // this.
+  if (attrtype == 0) {
     ASN1_STRING_free(stmp);
-    return 0;
+    return 1;
+  }
+  if (!(ttmp = ASN1_TYPE_new())) {
+    goto err;
+  }
+  if ((len == -1) && !(attrtype & MBSTRING_FLAG)) {
+    if (!ASN1_TYPE_set1(ttmp, attrtype, data)) {
+      goto err;
+    }
+  } else {
+    ASN1_TYPE_set(ttmp, atype, stmp);
+    stmp = NULL;
+  }
+  if (!sk_ASN1_TYPE_push(attr->set, ttmp)) {
+    goto err;
+  }
+  return 1;
+err:
+  OPENSSL_PUT_ERROR(X509, ERR_R_MALLOC_FAILURE);
+  ASN1_TYPE_free(ttmp);
+  ASN1_STRING_free(stmp);
+  return 0;
 }
 
-int X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr)
-{
-    return sk_ASN1_TYPE_num(attr->set);
+int X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr) {
+  return sk_ASN1_TYPE_num(attr->set);
 }
 
-ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr)
-{
-    if (attr == NULL)
-        return (NULL);
-    return (attr->object);
+ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr) {
+  if (attr == NULL) {
+    return NULL;
+  }
+  return attr->object;
 }
 
-void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx,
-                               int attrtype, void *unused)
-{
-    ASN1_TYPE *ttmp;
-    ttmp = X509_ATTRIBUTE_get0_type(attr, idx);
-    if (!ttmp)
-        return NULL;
-    if (attrtype != ASN1_TYPE_get(ttmp)) {
-        OPENSSL_PUT_ERROR(X509, X509_R_WRONG_TYPE);
-        return NULL;
-    }
-    return (void *)asn1_type_value_as_pointer(ttmp);
+void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, int attrtype,
+                               void *unused) {
+  ASN1_TYPE *ttmp;
+  ttmp = X509_ATTRIBUTE_get0_type(attr, idx);
+  if (!ttmp) {
+    return NULL;
+  }
+  if (attrtype != ASN1_TYPE_get(ttmp)) {
+    OPENSSL_PUT_ERROR(X509, X509_R_WRONG_TYPE);
+    return NULL;
+  }
+  return (void *)asn1_type_value_as_pointer(ttmp);
 }
 
-ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx)
-{
-    if (attr == NULL)
-        return NULL;
-    if (idx >= X509_ATTRIBUTE_count(attr))
-        return NULL;
-    return sk_ASN1_TYPE_value(attr->set, idx);
+ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx) {
+  if (attr == NULL) {
+    return NULL;
+  }
+  if (idx >= X509_ATTRIBUTE_count(attr)) {
+    return NULL;
+  }
+  return sk_ASN1_TYPE_value(attr->set, idx);
 }