From e4518488142a8e5eeca4ec06a39243dec9c81cc0 Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 26 Jul 2024 13:24:39 +0000 Subject: [PATCH] Inline trivial X509at_* calls in x509_req ok jsing --- lib/libcrypto/x509/x509_req.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/libcrypto/x509/x509_req.c b/lib/libcrypto/x509/x509_req.c index a21542c3baa..2565014972e 100644 --- a/lib/libcrypto/x509/x509_req.c +++ b/lib/libcrypto/x509/x509_req.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509_req.c,v 1.41 2024/05/09 14:29:08 tb Exp $ */ +/* $OpenBSD: x509_req.c,v 1.42 2024/07/26 13:24:39 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -236,7 +236,7 @@ LCRYPTO_ALIAS(X509_REQ_add_extensions); int X509_REQ_get_attr_count(const X509_REQ *req) { - return X509at_get_attr_count(req->req_info->attributes); + return sk_X509_ATTRIBUTE_num(req->req_info->attributes); } LCRYPTO_ALIAS(X509_REQ_get_attr_count); @@ -258,14 +258,14 @@ LCRYPTO_ALIAS(X509_REQ_get_attr_by_OBJ); X509_ATTRIBUTE * X509_REQ_get_attr(const X509_REQ *req, int loc) { - return X509at_get_attr(req->req_info->attributes, loc); + return sk_X509_ATTRIBUTE_value(req->req_info->attributes, loc); } LCRYPTO_ALIAS(X509_REQ_get_attr); X509_ATTRIBUTE * X509_REQ_delete_attr(X509_REQ *req, int loc) { - return X509at_delete_attr(req->req_info->attributes, loc); + return sk_X509_ATTRIBUTE_delete(req->req_info->attributes, loc); } LCRYPTO_ALIAS(X509_REQ_delete_attr); -- 2.20.1