diff options
author | tb <> | 2018-03-17 15:43:32 +0000 |
---|---|---|
committer | tb <> | 2018-03-17 15:43:32 +0000 |
commit | 702c47a24ac730c6871fa43dafa9ee6d044a38e0 (patch) | |
tree | fb7afcdd4d8725d20c264f973b2ec9d7237818de | |
parent | 2a6a1818f8647d823a4f73d2687c748e7f2e0290 (diff) | |
download | openbsd-702c47a24ac730c6871fa43dafa9ee6d044a38e0.tar.gz openbsd-702c47a24ac730c6871fa43dafa9ee6d044a38e0.tar.bz2 openbsd-702c47a24ac730c6871fa43dafa9ee6d044a38e0.zip |
Provide X509_STORE_get0_param()
ok jsing
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 1 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_lu.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/x509_vfy.h | 3 |
3 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index 4410cce639..8931abaf52 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
@@ -2895,6 +2895,7 @@ X509_STORE_add_crl | |||
2895 | X509_STORE_add_lookup | 2895 | X509_STORE_add_lookup |
2896 | X509_STORE_free | 2896 | X509_STORE_free |
2897 | X509_STORE_get0_objects | 2897 | X509_STORE_get0_objects |
2898 | X509_STORE_get0_param | ||
2898 | X509_STORE_get1_certs | 2899 | X509_STORE_get1_certs |
2899 | X509_STORE_get1_crls | 2900 | X509_STORE_get1_crls |
2900 | X509_STORE_get_by_subject | 2901 | X509_STORE_get_by_subject |
diff --git a/src/lib/libcrypto/x509/x509_lu.c b/src/lib/libcrypto/x509/x509_lu.c index 0033069b3e..742eb4d2bf 100644 --- a/src/lib/libcrypto/x509/x509_lu.c +++ b/src/lib/libcrypto/x509/x509_lu.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_lu.c,v 1.27 2018/03/17 15:39:43 tb Exp $ */ | 1 | /* $OpenBSD: x509_lu.c,v 1.28 2018/03/17 15:43:32 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 | * |
@@ -803,6 +803,12 @@ X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *param) | |||
803 | return X509_VERIFY_PARAM_set1(ctx->param, param); | 803 | return X509_VERIFY_PARAM_set1(ctx->param, param); |
804 | } | 804 | } |
805 | 805 | ||
806 | X509_VERIFY_PARAM * | ||
807 | X509_STORE_get0_param(X509_STORE *ctx) | ||
808 | { | ||
809 | return ctx->param; | ||
810 | } | ||
811 | |||
806 | void | 812 | void |
807 | X509_STORE_set_verify_cb(X509_STORE *ctx, | 813 | X509_STORE_set_verify_cb(X509_STORE *ctx, |
808 | int (*verify_cb)(int, X509_STORE_CTX *)) | 814 | int (*verify_cb)(int, X509_STORE_CTX *)) |
diff --git a/src/lib/libcrypto/x509/x509_vfy.h b/src/lib/libcrypto/x509/x509_vfy.h index 3ee26ccd7b..ad729d84ed 100644 --- a/src/lib/libcrypto/x509/x509_vfy.h +++ b/src/lib/libcrypto/x509/x509_vfy.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: x509_vfy.h,v 1.25 2018/03/17 15:39:43 tb Exp $ */ | 1 | /* $OpenBSD: x509_vfy.h,v 1.26 2018/03/17 15:43:32 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 | * |
@@ -443,6 +443,7 @@ int X509_STORE_set_flags(X509_STORE *ctx, unsigned long flags); | |||
443 | int X509_STORE_set_purpose(X509_STORE *ctx, int purpose); | 443 | int X509_STORE_set_purpose(X509_STORE *ctx, int purpose); |
444 | int X509_STORE_set_trust(X509_STORE *ctx, int trust); | 444 | int X509_STORE_set_trust(X509_STORE *ctx, int trust); |
445 | int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *pm); | 445 | int X509_STORE_set1_param(X509_STORE *ctx, X509_VERIFY_PARAM *pm); |
446 | X509_VERIFY_PARAM *X509_STORE_get0_param(X509_STORE *ctx); | ||
446 | 447 | ||
447 | void X509_STORE_set_verify_cb(X509_STORE *ctx, | 448 | void X509_STORE_set_verify_cb(X509_STORE *ctx, |
448 | int (*verify_cb)(int, X509_STORE_CTX *)); | 449 | int (*verify_cb)(int, X509_STORE_CTX *)); |