diff options
author | tb <> | 2018-05-18 19:21:33 +0000 |
---|---|---|
committer | tb <> | 2018-05-18 19:21:33 +0000 |
commit | f91d4aaae12c6f9d20b432592b82becaa8347a0c (patch) | |
tree | 8de6f4a7bc60032d4b01594033ccc9f64c6750f9 /src/lib | |
parent | 7c1bacfd1e2180b7fa9c03c8eb8a8d3217490562 (diff) | |
download | openbsd-f91d4aaae12c6f9d20b432592b82becaa8347a0c.tar.gz openbsd-f91d4aaae12c6f9d20b432592b82becaa8347a0c.tar.bz2 openbsd-f91d4aaae12c6f9d20b432592b82becaa8347a0c.zip |
Add const to the argument of X509_ATTRIBUTE_count(3).
tested in a bulk build by sthen
ok jsing
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/x509/x509.h | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_att.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h index 56c1b8a1a0..ec7887a928 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.62 2018/05/18 18:40:38 tb Exp $ */ | 1 | /* $OpenBSD: x509.h,v 1.63 2018/05/18 19:21:33 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 | * |
@@ -1225,7 +1225,7 @@ int X509_ATTRIBUTE_set1_object(X509_ATTRIBUTE *attr, const ASN1_OBJECT *obj); | |||
1225 | int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data, int len); | 1225 | int X509_ATTRIBUTE_set1_data(X509_ATTRIBUTE *attr, int attrtype, const void *data, int len); |
1226 | void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, | 1226 | void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, |
1227 | int atrtype, void *data); | 1227 | int atrtype, void *data); |
1228 | int X509_ATTRIBUTE_count(X509_ATTRIBUTE *attr); | 1228 | int X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr); |
1229 | ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr); | 1229 | ASN1_OBJECT *X509_ATTRIBUTE_get0_object(X509_ATTRIBUTE *attr); |
1230 | ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx); | 1230 | ASN1_TYPE *X509_ATTRIBUTE_get0_type(X509_ATTRIBUTE *attr, int idx); |
1231 | 1231 | ||
diff --git a/src/lib/libcrypto/x509/x509_att.c b/src/lib/libcrypto/x509/x509_att.c index edadacc2c7..1479b918c7 100644 --- a/src/lib/libcrypto/x509/x509_att.c +++ b/src/lib/libcrypto/x509/x509_att.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_att.c,v 1.16 2018/05/13 06:48:00 tb Exp $ */ | 1 | /* $OpenBSD: x509_att.c,v 1.17 2018/05/18 19:21:33 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 | * |
@@ -353,7 +353,7 @@ err: | |||
353 | } | 353 | } |
354 | 354 | ||
355 | int | 355 | int |
356 | X509_ATTRIBUTE_count(X509_ATTRIBUTE *attr) | 356 | X509_ATTRIBUTE_count(const X509_ATTRIBUTE *attr) |
357 | { | 357 | { |
358 | if (!attr->single) | 358 | if (!attr->single) |
359 | return sk_ASN1_TYPE_num(attr->value.set); | 359 | return sk_ASN1_TYPE_num(attr->value.set); |