summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2021-11-01 17:20:50 +0000
committertb <>2021-11-01 17:20:50 +0000
commit95589e2e9b8cb0aa7ceb0bdf1ad9af358f6564db (patch)
tree49d5b98c0cb5ba1bf3b1ab907471b5714b0e5f08 /src/lib
parentf1406a5c1498bab780dc0fa00184846d33664572 (diff)
downloadopenbsd-95589e2e9b8cb0aa7ceb0bdf1ad9af358f6564db.tar.gz
openbsd-95589e2e9b8cb0aa7ceb0bdf1ad9af358f6564db.tar.bz2
openbsd-95589e2e9b8cb0aa7ceb0bdf1ad9af358f6564db.zip
In X509_STORE_CTX_get_obj_from_subject() rename X509_OBJECT from
the generic 'ret' to obj' in X509. Requested by jsing
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/x509/x509_lu.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/x509/x509_lu.c b/src/lib/libcrypto/x509/x509_lu.c
index 143ad152ba..d4ea527662 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.36 2021/10/31 16:23:45 tb Exp $ */ 1/* $OpenBSD: x509_lu.c,v 1.37 2021/11/01 17:20:50 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 *
@@ -325,16 +325,16 @@ X509_OBJECT *
325X509_STORE_CTX_get_obj_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type, 325X509_STORE_CTX_get_obj_by_subject(X509_STORE_CTX *vs, X509_LOOKUP_TYPE type,
326 X509_NAME *name) 326 X509_NAME *name)
327{ 327{
328 X509_OBJECT *ret; 328 X509_OBJECT *obj;
329 329
330 if ((ret = X509_OBJECT_new()) == NULL) 330 if ((obj = X509_OBJECT_new()) == NULL)
331 return NULL; 331 return NULL;
332 if (!X509_STORE_CTX_get_by_subject(vs, type, name, ret)) { 332 if (!X509_STORE_CTX_get_by_subject(vs, type, name, obj)) {
333 X509_OBJECT_free(ret); 333 X509_OBJECT_free(obj);
334 return NULL; 334 return NULL;
335 } 335 }
336 336
337 return ret; 337 return obj;
338} 338}
339 339
340int 340int