diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509.h')
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index b2eeac92ae..349265891a 100644 --- a/src/lib/libcrypto/x509/x509.h +++ b/src/lib/libcrypto/x509/x509.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509.h,v 1.46 2018/05/01 19:01:28 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.47 2018/05/13 06:48:00 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -1018,7 +1018,7 @@ int X509_REQ_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts); | |||
1018 | int X509_REQ_get_attr_count(const X509_REQ *req); | 1018 | int X509_REQ_get_attr_count(const X509_REQ *req); |
1019 | int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, | 1019 | int X509_REQ_get_attr_by_NID(const X509_REQ *req, int nid, |
1020 | int lastpos); | 1020 | int lastpos); |
1021 | int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, ASN1_OBJECT *obj, | 1021 | int X509_REQ_get_attr_by_OBJ(const X509_REQ *req, const ASN1_OBJECT *obj, |
1022 | int lastpos); | 1022 | int lastpos); |
1023 | X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc); | 1023 | X509_ATTRIBUTE *X509_REQ_get_attr(const X509_REQ *req, int loc); |
1024 | X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc); | 1024 | X509_ATTRIBUTE *X509_REQ_delete_attr(X509_REQ *req, int loc); |
@@ -1186,8 +1186,8 @@ int X509_EXTENSION_get_critical(X509_EXTENSION *ex); | |||
1186 | int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x); | 1186 | int X509at_get_attr_count(const STACK_OF(X509_ATTRIBUTE) *x); |
1187 | int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, | 1187 | int X509at_get_attr_by_NID(const STACK_OF(X509_ATTRIBUTE) *x, int nid, |
1188 | int lastpos); | 1188 | int lastpos); |
1189 | int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk, ASN1_OBJECT *obj, | 1189 | int X509at_get_attr_by_OBJ(const STACK_OF(X509_ATTRIBUTE) *sk, |
1190 | int lastpos); | 1190 | const ASN1_OBJECT *obj, int lastpos); |
1191 | X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc); | 1191 | X509_ATTRIBUTE *X509at_get_attr(const STACK_OF(X509_ATTRIBUTE) *x, int loc); |
1192 | X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc); | 1192 | X509_ATTRIBUTE *X509at_delete_attr(STACK_OF(X509_ATTRIBUTE) *x, int loc); |
1193 | STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, | 1193 | STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr(STACK_OF(X509_ATTRIBUTE) **x, |
@@ -1202,7 +1202,7 @@ STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x, | |||
1202 | const char *attrname, int type, | 1202 | const char *attrname, int type, |
1203 | const unsigned char *bytes, int len); | 1203 | const unsigned char *bytes, int len); |
1204 | void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, | 1204 | void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x, |
1205 | ASN1_OBJECT *obj, int lastpos, int type); | 1205 | const ASN1_OBJECT *obj, int lastpos, int type); |
1206 | X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, | 1206 | X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid, |
1207 | int atrtype, const void *data, int len); | 1207 | int atrtype, const void *data, int len); |
1208 | X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr, | 1208 | X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr, |
@@ -1220,7 +1220,7 @@ ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx); | |||
1220 | int EVP_PKEY_get_attr_count(const EVP_PKEY *key); | 1220 | int EVP_PKEY_get_attr_count(const EVP_PKEY *key); |
1221 | int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, | 1221 | int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, |
1222 | int lastpos); | 1222 | int lastpos); |
1223 | int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, ASN1_OBJECT *obj, | 1223 | int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, const ASN1_OBJECT *obj, |
1224 | int lastpos); | 1224 | int lastpos); |
1225 | X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc); | 1225 | X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc); |
1226 | X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc); | 1226 | X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc); |