diff options
| author |   jsing <jsing@openbsd.org> | 2016-12-21 15:15:45 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2016-12-21 15:15:45 +0000 |
| commit | 47398500e4b2c9dcf801c467f09b7526cfb42698 (patch) | |
| tree | 7c52804e09471ad960d6b748ee61ddbbd9a6b48a | |
| parent | Adopt relevant part of NetBSD's r1.7 commit to discard unused results of the (diff) | |
| download | wireguard-openbsd-47398500e4b2c9dcf801c467f09b7526cfb42698.tar.xz wireguard-openbsd-47398500e4b2c9dcf801c467f09b7526cfb42698.zip | |
Remove prototypes from the public header for X509_VERIFY_PARAM functions
that were recently added but not intended to be made public at this stage.
Discussed with beck@
| -rw-r--r-- | lib/libcrypto/x509/x509_vfy.h | 6 | ||||
| -rw-r--r-- | lib/libcrypto/x509/x509_vpm.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/libcrypto/x509/x509_vfy.h b/lib/libcrypto/x509/x509_vfy.h index 4b81e8a2cdd..b58d49d2e19 100644 --- a/lib/libcrypto/x509/x509_vfy.h +++ b/lib/libcrypto/x509/x509_vfy.h @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vfy.h,v 1.17 2016/11/05 20:14:59 beck Exp $ */ +/* $OpenBSD: x509_vfy.h,v 1.18 2016/12/21 15:15:45 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -541,10 +541,6 @@ int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, ASN1_OBJECT *policy); int X509_VERIFY_PARAM_set1_policies(X509_VERIFY_PARAM *param, STACK_OF(ASN1_OBJECT) *policies); -int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, const char *email, - size_t emaillen); -int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param, const unsigned char *ip, - size_t iplen); int X509_VERIFY_PARAM_get_depth(const X509_VERIFY_PARAM *param); int X509_VERIFY_PARAM_add0_table(X509_VERIFY_PARAM *param); diff --git a/lib/libcrypto/x509/x509_vpm.c b/lib/libcrypto/x509/x509_vpm.c index c71eeccc4c5..3482227477b 100644 --- a/lib/libcrypto/x509/x509_vpm.c +++ b/lib/libcrypto/x509/x509_vpm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_vpm.c,v 1.14 2016/11/06 10:17:49 beck Exp $ */ +/* $OpenBSD: x509_vpm.c,v 1.15 2016/12/21 15:15:45 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2004. */ @@ -70,6 +70,11 @@ /* X509_VERIFY_PARAM functions */ +int X509_VERIFY_PARAM_set1_email(X509_VERIFY_PARAM *param, const char *email, + size_t emaillen); +int X509_VERIFY_PARAM_set1_ip(X509_VERIFY_PARAM *param, const unsigned char *ip, + size_t iplen); + #define SET_HOST 0 #define ADD_HOST 1 |