summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortb <>2019-04-21 16:25:40 +0000
committertb <>2019-04-21 16:25:40 +0000
commitfc4f91a73970c7640496caafc30e931e40e50803 (patch)
tree7c2783e028ce10fb5ac06e869238dafbb6c0d592
parent5f9ca97d113397cd5eeb2803e5b503a2afbd51fb (diff)
downloadopenbsd-fc4f91a73970c7640496caafc30e931e40e50803.tar.gz
openbsd-fc4f91a73970c7640496caafc30e931e40e50803.tar.bz2
openbsd-fc4f91a73970c7640496caafc30e931e40e50803.zip
KNF: use proper wrapping of function return type and name
-rw-r--r--src/lib/libcrypto/x509v3/pcy_node.c5
-rw-r--r--src/lib/libcrypto/x509v3/v3_cpols.c7
-rw-r--r--src/lib/libcrypto/x509v3/v3_crld.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libcrypto/x509v3/pcy_node.c b/src/lib/libcrypto/x509v3/pcy_node.c
index ba22b267bf..c966463606 100644
--- a/src/lib/libcrypto/x509v3/pcy_node.c
+++ b/src/lib/libcrypto/x509v3/pcy_node.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pcy_node.c,v 1.6 2015/07/18 00:01:05 beck Exp $ */ 1/* $OpenBSD: pcy_node.c,v 1.7 2019/04/21 16:25:40 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 */
@@ -68,7 +68,8 @@ node_cmp(const X509_POLICY_NODE * const *a, const X509_POLICY_NODE * const *b)
68 return OBJ_cmp((*a)->data->valid_policy, (*b)->data->valid_policy); 68 return OBJ_cmp((*a)->data->valid_policy, (*b)->data->valid_policy);
69} 69}
70 70
71STACK_OF(X509_POLICY_NODE) *policy_node_cmp_new(void) 71STACK_OF(X509_POLICY_NODE) *
72policy_node_cmp_new(void)
72{ 73{
73 return sk_X509_POLICY_NODE_new(node_cmp); 74 return sk_X509_POLICY_NODE_new(node_cmp);
74} 75}
diff --git a/src/lib/libcrypto/x509v3/v3_cpols.c b/src/lib/libcrypto/x509v3/v3_cpols.c
index 34d3381d76..4359327b8b 100644
--- a/src/lib/libcrypto/x509v3/v3_cpols.c
+++ b/src/lib/libcrypto/x509v3/v3_cpols.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_cpols.c,v 1.25 2017/01/29 17:49:23 beck Exp $ */ 1/* $OpenBSD: v3_cpols.c,v 1.26 2019/04/21 16:25:40 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 1999. 3 * project 1999.
4 */ 4 */
@@ -398,9 +398,8 @@ NOTICEREF_free(NOTICEREF *a)
398 ASN1_item_free((ASN1_VALUE *)a, &NOTICEREF_it); 398 ASN1_item_free((ASN1_VALUE *)a, &NOTICEREF_it);
399} 399}
400 400
401static 401static STACK_OF(POLICYINFO) *
402STACK_OF(POLICYINFO) *r2i_certpol(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, 402r2i_certpol(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *value)
403 char *value)
404{ 403{
405 STACK_OF(POLICYINFO) *pols = NULL; 404 STACK_OF(POLICYINFO) *pols = NULL;
406 char *pstr; 405 char *pstr;
diff --git a/src/lib/libcrypto/x509v3/v3_crld.c b/src/lib/libcrypto/x509v3/v3_crld.c
index 8660c1ee4b..039435f1db 100644
--- a/src/lib/libcrypto/x509v3/v3_crld.c
+++ b/src/lib/libcrypto/x509v3/v3_crld.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_crld.c,v 1.22 2017/05/02 04:11:08 deraadt Exp $ */ 1/* $OpenBSD: v3_crld.c,v 1.23 2019/04/21 16:25:40 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 1999. 3 * project 1999.
4 */ 4 */
@@ -104,8 +104,8 @@ const X509V3_EXT_METHOD v3_freshest_crl = {
104 .usr_data = NULL, 104 .usr_data = NULL,
105}; 105};
106 106
107static 107static STACK_OF(GENERAL_NAME) *
108STACK_OF(GENERAL_NAME) *gnames_from_sectname(X509V3_CTX *ctx, char *sect) 108gnames_from_sectname(X509V3_CTX *ctx, char *sect)
109{ 109{
110 STACK_OF(CONF_VALUE) *gnsect; 110 STACK_OF(CONF_VALUE) *gnsect;
111 STACK_OF(GENERAL_NAME) *gens; 111 STACK_OF(GENERAL_NAME) *gens;