summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2022-06-27 14:00:09 +0000
committertb <>2022-06-27 14:00:09 +0000
commit6ed54976ab988ec7cfdbaf1ac00396b0eea716ba (patch)
tree6652b704559804a63e8900495dcb6dbcab41a07c /src
parent1dfc6d4bc0a9c452ed36f0b04d5dcf53b77e6f1f (diff)
downloadopenbsd-6ed54976ab988ec7cfdbaf1ac00396b0eea716ba.tar.gz
openbsd-6ed54976ab988ec7cfdbaf1ac00396b0eea716ba.tar.bz2
openbsd-6ed54976ab988ec7cfdbaf1ac00396b0eea716ba.zip
Prepare to provide X509_VERIFY_PARAM_set_auth_level()
For some unknown reason this needed a different name than security_level, both internally and in the public API. Obviously it is exactly the same garbage. ok beck jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/x509/x509_lcl.h1
-rw-r--r--src/lib/libcrypto/x509/x509_vfy.h5
-rw-r--r--src/lib/libcrypto/x509/x509_vpm.c8
3 files changed, 12 insertions, 2 deletions
diff --git a/src/lib/libcrypto/x509/x509_lcl.h b/src/lib/libcrypto/x509/x509_lcl.h
index 5beef8a94d..d42fa4ad8b 100644
--- a/src/lib/libcrypto/x509/x509_lcl.h
+++ b/src/lib/libcrypto/x509/x509_lcl.h
@@ -272,6 +272,7 @@ struct X509_VERIFY_PARAM_st {
272 int purpose; /* purpose to check untrusted certificates */ 272 int purpose; /* purpose to check untrusted certificates */
273 int trust; /* trust setting to check */ 273 int trust; /* trust setting to check */
274 int depth; /* Verify depth */ 274 int depth; /* Verify depth */
275 int security_level; /* 'Security level', see SP800-57. */
275 STACK_OF(ASN1_OBJECT) *policies; /* Permissible policies */ 276 STACK_OF(ASN1_OBJECT) *policies; /* Permissible policies */
276 X509_VERIFY_PARAM_ID *id; /* opaque ID data */ 277 X509_VERIFY_PARAM_ID *id; /* opaque ID data */
277} /* X509_VERIFY_PARAM */; 278} /* X509_VERIFY_PARAM */;
diff --git a/src/lib/libcrypto/x509/x509_vfy.h b/src/lib/libcrypto/x509/x509_vfy.h
index 9a649cbbad..a007fe4795 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.50 2022/01/14 07:53:45 tb Exp $ */ 1/* $OpenBSD: x509_vfy.h,v 1.51 2022/06/27 14:00:09 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 *
@@ -426,6 +426,9 @@ unsigned long X509_VERIFY_PARAM_get_flags(X509_VERIFY_PARAM *param);
426int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose); 426int X509_VERIFY_PARAM_set_purpose(X509_VERIFY_PARAM *param, int purpose);
427int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust); 427int X509_VERIFY_PARAM_set_trust(X509_VERIFY_PARAM *param, int trust);
428void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth); 428void X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth);
429#if defined(LIBRESSL_INTERNAL)
430void X509_VERIFY_PARAM_set_auth_level(X509_VERIFY_PARAM *param, int auth_level);
431#endif
429void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t); 432void X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t);
430int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param, 433int X509_VERIFY_PARAM_add0_policy(X509_VERIFY_PARAM *param,
431 ASN1_OBJECT *policy); 434 ASN1_OBJECT *policy);
diff --git a/src/lib/libcrypto/x509/x509_vpm.c b/src/lib/libcrypto/x509/x509_vpm.c
index 13171e40f5..d4ec2c597f 100644
--- a/src/lib/libcrypto/x509/x509_vpm.c
+++ b/src/lib/libcrypto/x509/x509_vpm.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: x509_vpm.c,v 1.28 2021/11/01 20:53:08 tb Exp $ */ 1/* $OpenBSD: x509_vpm.c,v 1.29 2022/06/27 14:00:09 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 2004. 3 * project 2004.
4 */ 4 */
@@ -454,6 +454,12 @@ X509_VERIFY_PARAM_set_depth(X509_VERIFY_PARAM *param, int depth)
454} 454}
455 455
456void 456void
457X509_VERIFY_PARAM_set_auth_level(X509_VERIFY_PARAM *param, int auth_level)
458{
459 param->security_level = auth_level;
460}
461
462void
457X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t) 463X509_VERIFY_PARAM_set_time(X509_VERIFY_PARAM *param, time_t t)
458{ 464{
459 param->check_time = t; 465 param->check_time = t;