From 38bc6a91e6b835277fe04c41f679587c7b390ffe Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 22 Jan 2015 11:16:56 +0000
Subject: Use field names in struct initialisers.
No change to generated assembly.
---
src/lib/libcrypto/x509/by_dir.c | 22 +++++++++++-----------
src/lib/libcrypto/x509/by_file.c | 22 +++++++++++-----------
src/lib/libcrypto/x509/by_mem.c | 22 +++++++++++-----------
src/lib/libssl/src/crypto/x509/by_dir.c | 22 +++++++++++-----------
src/lib/libssl/src/crypto/x509/by_file.c | 22 +++++++++++-----------
src/lib/libssl/src/crypto/x509/by_mem.c | 22 +++++++++++-----------
6 files changed, 66 insertions(+), 66 deletions(-)
(limited to 'src')
diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c
index 193adb12f9..3ac6f11f07 100644
--- a/src/lib/libcrypto/x509/by_dir.c
+++ b/src/lib/libcrypto/x509/by_dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_dir.c,v 1.33 2014/09/23 20:01:11 miod Exp $ */
+/* $OpenBSD: by_dir.c,v 1.34 2015/01/22 11:16:56 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -102,16 +102,16 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
X509_OBJECT *ret);
X509_LOOKUP_METHOD x509_dir_lookup = {
- "Load certs from files in a directory",
- new_dir, /* new */
- free_dir, /* free */
- NULL, /* init */
- NULL, /* shutdown */
- dir_ctrl, /* ctrl */
- get_cert_by_subject, /* get_by_subject */
- NULL, /* get_by_issuer_serial */
- NULL, /* get_by_fingerprint */
- NULL, /* get_by_alias */
+ .name = "Load certs from files in a directory",
+ .new_item = new_dir,
+ .free = free_dir,
+ .init = NULL,
+ .shutdown = NULL,
+ .ctrl = dir_ctrl,
+ .get_by_subject = get_cert_by_subject,
+ .get_by_issuer_serial = NULL,
+ .get_by_fingerprint = NULL,
+ .get_by_alias = NULL,
};
X509_LOOKUP_METHOD *
diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
index 04366460bb..111289e143 100644
--- a/src/lib/libcrypto/x509/by_file.c
+++ b/src/lib/libcrypto/x509/by_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_file.c,v 1.16 2014/07/25 06:05:32 doug Exp $ */
+/* $OpenBSD: by_file.c,v 1.17 2015/01/22 11:16:56 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -71,16 +71,16 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
long argl, char **ret);
X509_LOOKUP_METHOD x509_file_lookup = {
- "Load file into cache",
- NULL, /* new */
- NULL, /* free */
- NULL, /* init */
- NULL, /* shutdown */
- by_file_ctrl, /* ctrl */
- NULL, /* get_by_subject */
- NULL, /* get_by_issuer_serial */
- NULL, /* get_by_fingerprint */
- NULL, /* get_by_alias */
+ .name = "Load file into cache",
+ .new_item = NULL,
+ .free = NULL,
+ .init = NULL,
+ .shutdown = NULL,
+ .ctrl = by_file_ctrl,
+ .get_by_subject = NULL,
+ .get_by_issuer_serial = NULL,
+ .get_by_fingerprint = NULL,
+ .get_by_alias = NULL,
};
X509_LOOKUP_METHOD *
diff --git a/src/lib/libcrypto/x509/by_mem.c b/src/lib/libcrypto/x509/by_mem.c
index 6a6ae96131..c01c4d20be 100644
--- a/src/lib/libcrypto/x509/by_mem.c
+++ b/src/lib/libcrypto/x509/by_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_mem.c,v 1.1 2015/01/22 09:06:39 reyk Exp $ */
+/* $OpenBSD: by_mem.c,v 1.2 2015/01/22 11:16:56 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -71,16 +71,16 @@
static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **);
X509_LOOKUP_METHOD x509_mem_lookup = {
- "Load cert from memory",
- NULL, /* new */
- NULL, /* free */
- NULL, /* init */
- NULL, /* shutdown */
- by_mem_ctrl, /* ctrl */
- NULL, /* get_by_subject */
- NULL, /* get_by_issuer_serial */
- NULL, /* get_by_fingerprint */
- NULL, /* get_by_alias */
+ .name = "Load cert from memory",
+ .new_item = NULL,
+ .free = NULL,
+ .init = NULL,
+ .shutdown = NULL,
+ .ctrl = by_mem_ctrl,
+ .get_by_subject = NULL,
+ .get_by_issuer_serial = NULL,
+ .get_by_fingerprint = NULL,
+ .get_by_alias = NULL,
};
X509_LOOKUP_METHOD *
diff --git a/src/lib/libssl/src/crypto/x509/by_dir.c b/src/lib/libssl/src/crypto/x509/by_dir.c
index 193adb12f9..3ac6f11f07 100644
--- a/src/lib/libssl/src/crypto/x509/by_dir.c
+++ b/src/lib/libssl/src/crypto/x509/by_dir.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_dir.c,v 1.33 2014/09/23 20:01:11 miod Exp $ */
+/* $OpenBSD: by_dir.c,v 1.34 2015/01/22 11:16:56 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -102,16 +102,16 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name,
X509_OBJECT *ret);
X509_LOOKUP_METHOD x509_dir_lookup = {
- "Load certs from files in a directory",
- new_dir, /* new */
- free_dir, /* free */
- NULL, /* init */
- NULL, /* shutdown */
- dir_ctrl, /* ctrl */
- get_cert_by_subject, /* get_by_subject */
- NULL, /* get_by_issuer_serial */
- NULL, /* get_by_fingerprint */
- NULL, /* get_by_alias */
+ .name = "Load certs from files in a directory",
+ .new_item = new_dir,
+ .free = free_dir,
+ .init = NULL,
+ .shutdown = NULL,
+ .ctrl = dir_ctrl,
+ .get_by_subject = get_cert_by_subject,
+ .get_by_issuer_serial = NULL,
+ .get_by_fingerprint = NULL,
+ .get_by_alias = NULL,
};
X509_LOOKUP_METHOD *
diff --git a/src/lib/libssl/src/crypto/x509/by_file.c b/src/lib/libssl/src/crypto/x509/by_file.c
index 04366460bb..111289e143 100644
--- a/src/lib/libssl/src/crypto/x509/by_file.c
+++ b/src/lib/libssl/src/crypto/x509/by_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_file.c,v 1.16 2014/07/25 06:05:32 doug Exp $ */
+/* $OpenBSD: by_file.c,v 1.17 2015/01/22 11:16:56 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -71,16 +71,16 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
long argl, char **ret);
X509_LOOKUP_METHOD x509_file_lookup = {
- "Load file into cache",
- NULL, /* new */
- NULL, /* free */
- NULL, /* init */
- NULL, /* shutdown */
- by_file_ctrl, /* ctrl */
- NULL, /* get_by_subject */
- NULL, /* get_by_issuer_serial */
- NULL, /* get_by_fingerprint */
- NULL, /* get_by_alias */
+ .name = "Load file into cache",
+ .new_item = NULL,
+ .free = NULL,
+ .init = NULL,
+ .shutdown = NULL,
+ .ctrl = by_file_ctrl,
+ .get_by_subject = NULL,
+ .get_by_issuer_serial = NULL,
+ .get_by_fingerprint = NULL,
+ .get_by_alias = NULL,
};
X509_LOOKUP_METHOD *
diff --git a/src/lib/libssl/src/crypto/x509/by_mem.c b/src/lib/libssl/src/crypto/x509/by_mem.c
index 6a6ae96131..c01c4d20be 100644
--- a/src/lib/libssl/src/crypto/x509/by_mem.c
+++ b/src/lib/libssl/src/crypto/x509/by_mem.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: by_mem.c,v 1.1 2015/01/22 09:06:39 reyk Exp $ */
+/* $OpenBSD: by_mem.c,v 1.2 2015/01/22 11:16:56 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -71,16 +71,16 @@
static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **);
X509_LOOKUP_METHOD x509_mem_lookup = {
- "Load cert from memory",
- NULL, /* new */
- NULL, /* free */
- NULL, /* init */
- NULL, /* shutdown */
- by_mem_ctrl, /* ctrl */
- NULL, /* get_by_subject */
- NULL, /* get_by_issuer_serial */
- NULL, /* get_by_fingerprint */
- NULL, /* get_by_alias */
+ .name = "Load cert from memory",
+ .new_item = NULL,
+ .free = NULL,
+ .init = NULL,
+ .shutdown = NULL,
+ .ctrl = by_mem_ctrl,
+ .get_by_subject = NULL,
+ .get_by_issuer_serial = NULL,
+ .get_by_fingerprint = NULL,
+ .get_by_alias = NULL,
};
X509_LOOKUP_METHOD *
--
cgit v1.2.3-55-g6feb