diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_purp.c | 16 | ||||
| -rw-r--r-- | src/lib/libcrypto/x509v3/x509v3.h | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c index d692a19c25..0fdec224a3 100644 --- a/src/lib/libcrypto/x509v3/v3_purp.c +++ b/src/lib/libcrypto/x509v3/v3_purp.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: v3_purp.c,v 1.30 2017/06/22 17:28:00 jsing Exp $ */ | 1 | /* $OpenBSD: v3_purp.c,v 1.31 2018/05/18 18:30:03 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2001. | 3 | * project 2001. |
| 4 | */ | 4 | */ |
| @@ -172,7 +172,7 @@ X509_PURPOSE_get0(int idx) | |||
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | int | 174 | int |
| 175 | X509_PURPOSE_get_by_sname(char *sname) | 175 | X509_PURPOSE_get_by_sname(const char *sname) |
| 176 | { | 176 | { |
| 177 | int i; | 177 | int i; |
| 178 | X509_PURPOSE *xptmp; | 178 | X509_PURPOSE *xptmp; |
| @@ -204,8 +204,8 @@ X509_PURPOSE_get_by_id(int purpose) | |||
| 204 | 204 | ||
| 205 | int | 205 | int |
| 206 | X509_PURPOSE_add(int id, int trust, int flags, | 206 | X509_PURPOSE_add(int id, int trust, int flags, |
| 207 | int (*ck)(const X509_PURPOSE *, const X509 *, int), char *name, | 207 | int (*ck)(const X509_PURPOSE *, const X509 *, int), const char *name, |
| 208 | char *sname, void *arg) | 208 | const char *sname, void *arg) |
| 209 | { | 209 | { |
| 210 | int idx; | 210 | int idx; |
| 211 | X509_PURPOSE *ptmp; | 211 | X509_PURPOSE *ptmp; |
| @@ -302,25 +302,25 @@ X509_PURPOSE_cleanup(void) | |||
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | int | 304 | int |
| 305 | X509_PURPOSE_get_id(X509_PURPOSE *xp) | 305 | X509_PURPOSE_get_id(const X509_PURPOSE *xp) |
| 306 | { | 306 | { |
| 307 | return xp->purpose; | 307 | return xp->purpose; |
| 308 | } | 308 | } |
| 309 | 309 | ||
| 310 | char * | 310 | char * |
| 311 | X509_PURPOSE_get0_name(X509_PURPOSE *xp) | 311 | X509_PURPOSE_get0_name(const X509_PURPOSE *xp) |
| 312 | { | 312 | { |
| 313 | return xp->name; | 313 | return xp->name; |
| 314 | } | 314 | } |
| 315 | 315 | ||
| 316 | char * | 316 | char * |
| 317 | X509_PURPOSE_get0_sname(X509_PURPOSE *xp) | 317 | X509_PURPOSE_get0_sname(const X509_PURPOSE *xp) |
| 318 | { | 318 | { |
| 319 | return xp->sname; | 319 | return xp->sname; |
| 320 | } | 320 | } |
| 321 | 321 | ||
| 322 | int | 322 | int |
| 323 | X509_PURPOSE_get_trust(X509_PURPOSE *xp) | 323 | X509_PURPOSE_get_trust(const X509_PURPOSE *xp) |
| 324 | { | 324 | { |
| 325 | return xp->trust; | 325 | return xp->trust; |
| 326 | } | 326 | } |
diff --git a/src/lib/libcrypto/x509v3/x509v3.h b/src/lib/libcrypto/x509v3/x509v3.h index 429239424c..0d636d7bf4 100644 --- a/src/lib/libcrypto/x509v3/x509v3.h +++ b/src/lib/libcrypto/x509v3/x509v3.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: x509v3.h,v 1.25 2018/05/13 17:49:03 tb Exp $ */ | 1 | /* $OpenBSD: x509v3.h,v 1.26 2018/05/18 18:30:03 tb Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -782,16 +782,16 @@ int X509_check_issued(X509 *issuer, X509 *subject); | |||
| 782 | int X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid); | 782 | int X509_check_akid(X509 *issuer, AUTHORITY_KEYID *akid); |
| 783 | int X509_PURPOSE_get_count(void); | 783 | int X509_PURPOSE_get_count(void); |
| 784 | X509_PURPOSE * X509_PURPOSE_get0(int idx); | 784 | X509_PURPOSE * X509_PURPOSE_get0(int idx); |
| 785 | int X509_PURPOSE_get_by_sname(char *sname); | 785 | int X509_PURPOSE_get_by_sname(const char *sname); |
| 786 | int X509_PURPOSE_get_by_id(int id); | 786 | int X509_PURPOSE_get_by_id(int id); |
| 787 | int X509_PURPOSE_add(int id, int trust, int flags, | 787 | int X509_PURPOSE_add(int id, int trust, int flags, |
| 788 | int (*ck)(const X509_PURPOSE *, const X509 *, int), | 788 | int (*ck)(const X509_PURPOSE *, const X509 *, int), |
| 789 | char *name, char *sname, void *arg); | 789 | const char *name, const char *sname, void *arg); |
| 790 | char *X509_PURPOSE_get0_name(X509_PURPOSE *xp); | 790 | char *X509_PURPOSE_get0_name(const X509_PURPOSE *xp); |
| 791 | char *X509_PURPOSE_get0_sname(X509_PURPOSE *xp); | 791 | char *X509_PURPOSE_get0_sname(const X509_PURPOSE *xp); |
| 792 | int X509_PURPOSE_get_trust(X509_PURPOSE *xp); | 792 | int X509_PURPOSE_get_trust(const X509_PURPOSE *xp); |
| 793 | void X509_PURPOSE_cleanup(void); | 793 | void X509_PURPOSE_cleanup(void); |
| 794 | int X509_PURPOSE_get_id(X509_PURPOSE *); | 794 | int X509_PURPOSE_get_id(const X509_PURPOSE *); |
| 795 | 795 | ||
| 796 | STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x); | 796 | STACK_OF(OPENSSL_STRING) *X509_get1_email(X509 *x); |
| 797 | STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x); | 797 | STACK_OF(OPENSSL_STRING) *X509_REQ_get1_email(X509_REQ *x); |
