diff options
author | jsing <> | 2015-01-22 11:16:56 +0000 |
---|---|---|
committer | jsing <> | 2015-01-22 11:16:56 +0000 |
commit | 38bc6a91e6b835277fe04c41f679587c7b390ffe (patch) | |
tree | 757a78dbde7b2d9212de8c2c281ad0f9d284874b /src | |
parent | 2bc15f5e337a5d3f766b86fdbafd2024dd008126 (diff) | |
download | openbsd-38bc6a91e6b835277fe04c41f679587c7b390ffe.tar.gz openbsd-38bc6a91e6b835277fe04c41f679587c7b390ffe.tar.bz2 openbsd-38bc6a91e6b835277fe04c41f679587c7b390ffe.zip |
Use field names in struct initialisers.
No change to generated assembly.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/x509/by_dir.c | 22 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/by_file.c | 22 | ||||
-rw-r--r-- | src/lib/libcrypto/x509/by_mem.c | 22 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/x509/by_dir.c | 22 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/x509/by_file.c | 22 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/x509/by_mem.c | 22 |
6 files changed, 66 insertions, 66 deletions
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 @@ | |||
1 | /* $OpenBSD: by_dir.c,v 1.33 2014/09/23 20:01:11 miod Exp $ */ | 1 | /* $OpenBSD: by_dir.c,v 1.34 2015/01/22 11:16:56 jsing 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 | * |
@@ -102,16 +102,16 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, | |||
102 | X509_OBJECT *ret); | 102 | X509_OBJECT *ret); |
103 | 103 | ||
104 | X509_LOOKUP_METHOD x509_dir_lookup = { | 104 | X509_LOOKUP_METHOD x509_dir_lookup = { |
105 | "Load certs from files in a directory", | 105 | .name = "Load certs from files in a directory", |
106 | new_dir, /* new */ | 106 | .new_item = new_dir, |
107 | free_dir, /* free */ | 107 | .free = free_dir, |
108 | NULL, /* init */ | 108 | .init = NULL, |
109 | NULL, /* shutdown */ | 109 | .shutdown = NULL, |
110 | dir_ctrl, /* ctrl */ | 110 | .ctrl = dir_ctrl, |
111 | get_cert_by_subject, /* get_by_subject */ | 111 | .get_by_subject = get_cert_by_subject, |
112 | NULL, /* get_by_issuer_serial */ | 112 | .get_by_issuer_serial = NULL, |
113 | NULL, /* get_by_fingerprint */ | 113 | .get_by_fingerprint = NULL, |
114 | NULL, /* get_by_alias */ | 114 | .get_by_alias = NULL, |
115 | }; | 115 | }; |
116 | 116 | ||
117 | X509_LOOKUP_METHOD * | 117 | 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 @@ | |||
1 | /* $OpenBSD: by_file.c,v 1.16 2014/07/25 06:05:32 doug Exp $ */ | 1 | /* $OpenBSD: by_file.c,v 1.17 2015/01/22 11:16:56 jsing 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 | * |
@@ -71,16 +71,16 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, | |||
71 | long argl, char **ret); | 71 | long argl, char **ret); |
72 | 72 | ||
73 | X509_LOOKUP_METHOD x509_file_lookup = { | 73 | X509_LOOKUP_METHOD x509_file_lookup = { |
74 | "Load file into cache", | 74 | .name = "Load file into cache", |
75 | NULL, /* new */ | 75 | .new_item = NULL, |
76 | NULL, /* free */ | 76 | .free = NULL, |
77 | NULL, /* init */ | 77 | .init = NULL, |
78 | NULL, /* shutdown */ | 78 | .shutdown = NULL, |
79 | by_file_ctrl, /* ctrl */ | 79 | .ctrl = by_file_ctrl, |
80 | NULL, /* get_by_subject */ | 80 | .get_by_subject = NULL, |
81 | NULL, /* get_by_issuer_serial */ | 81 | .get_by_issuer_serial = NULL, |
82 | NULL, /* get_by_fingerprint */ | 82 | .get_by_fingerprint = NULL, |
83 | NULL, /* get_by_alias */ | 83 | .get_by_alias = NULL, |
84 | }; | 84 | }; |
85 | 85 | ||
86 | X509_LOOKUP_METHOD * | 86 | 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 @@ | |||
1 | /* $OpenBSD: by_mem.c,v 1.1 2015/01/22 09:06:39 reyk Exp $ */ | 1 | /* $OpenBSD: by_mem.c,v 1.2 2015/01/22 11:16:56 jsing 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 | * |
@@ -71,16 +71,16 @@ | |||
71 | static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **); | 71 | static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **); |
72 | 72 | ||
73 | X509_LOOKUP_METHOD x509_mem_lookup = { | 73 | X509_LOOKUP_METHOD x509_mem_lookup = { |
74 | "Load cert from memory", | 74 | .name = "Load cert from memory", |
75 | NULL, /* new */ | 75 | .new_item = NULL, |
76 | NULL, /* free */ | 76 | .free = NULL, |
77 | NULL, /* init */ | 77 | .init = NULL, |
78 | NULL, /* shutdown */ | 78 | .shutdown = NULL, |
79 | by_mem_ctrl, /* ctrl */ | 79 | .ctrl = by_mem_ctrl, |
80 | NULL, /* get_by_subject */ | 80 | .get_by_subject = NULL, |
81 | NULL, /* get_by_issuer_serial */ | 81 | .get_by_issuer_serial = NULL, |
82 | NULL, /* get_by_fingerprint */ | 82 | .get_by_fingerprint = NULL, |
83 | NULL, /* get_by_alias */ | 83 | .get_by_alias = NULL, |
84 | }; | 84 | }; |
85 | 85 | ||
86 | X509_LOOKUP_METHOD * | 86 | 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 @@ | |||
1 | /* $OpenBSD: by_dir.c,v 1.33 2014/09/23 20:01:11 miod Exp $ */ | 1 | /* $OpenBSD: by_dir.c,v 1.34 2015/01/22 11:16:56 jsing 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 | * |
@@ -102,16 +102,16 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, | |||
102 | X509_OBJECT *ret); | 102 | X509_OBJECT *ret); |
103 | 103 | ||
104 | X509_LOOKUP_METHOD x509_dir_lookup = { | 104 | X509_LOOKUP_METHOD x509_dir_lookup = { |
105 | "Load certs from files in a directory", | 105 | .name = "Load certs from files in a directory", |
106 | new_dir, /* new */ | 106 | .new_item = new_dir, |
107 | free_dir, /* free */ | 107 | .free = free_dir, |
108 | NULL, /* init */ | 108 | .init = NULL, |
109 | NULL, /* shutdown */ | 109 | .shutdown = NULL, |
110 | dir_ctrl, /* ctrl */ | 110 | .ctrl = dir_ctrl, |
111 | get_cert_by_subject, /* get_by_subject */ | 111 | .get_by_subject = get_cert_by_subject, |
112 | NULL, /* get_by_issuer_serial */ | 112 | .get_by_issuer_serial = NULL, |
113 | NULL, /* get_by_fingerprint */ | 113 | .get_by_fingerprint = NULL, |
114 | NULL, /* get_by_alias */ | 114 | .get_by_alias = NULL, |
115 | }; | 115 | }; |
116 | 116 | ||
117 | X509_LOOKUP_METHOD * | 117 | 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 @@ | |||
1 | /* $OpenBSD: by_file.c,v 1.16 2014/07/25 06:05:32 doug Exp $ */ | 1 | /* $OpenBSD: by_file.c,v 1.17 2015/01/22 11:16:56 jsing 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 | * |
@@ -71,16 +71,16 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc, | |||
71 | long argl, char **ret); | 71 | long argl, char **ret); |
72 | 72 | ||
73 | X509_LOOKUP_METHOD x509_file_lookup = { | 73 | X509_LOOKUP_METHOD x509_file_lookup = { |
74 | "Load file into cache", | 74 | .name = "Load file into cache", |
75 | NULL, /* new */ | 75 | .new_item = NULL, |
76 | NULL, /* free */ | 76 | .free = NULL, |
77 | NULL, /* init */ | 77 | .init = NULL, |
78 | NULL, /* shutdown */ | 78 | .shutdown = NULL, |
79 | by_file_ctrl, /* ctrl */ | 79 | .ctrl = by_file_ctrl, |
80 | NULL, /* get_by_subject */ | 80 | .get_by_subject = NULL, |
81 | NULL, /* get_by_issuer_serial */ | 81 | .get_by_issuer_serial = NULL, |
82 | NULL, /* get_by_fingerprint */ | 82 | .get_by_fingerprint = NULL, |
83 | NULL, /* get_by_alias */ | 83 | .get_by_alias = NULL, |
84 | }; | 84 | }; |
85 | 85 | ||
86 | X509_LOOKUP_METHOD * | 86 | 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 @@ | |||
1 | /* $OpenBSD: by_mem.c,v 1.1 2015/01/22 09:06:39 reyk Exp $ */ | 1 | /* $OpenBSD: by_mem.c,v 1.2 2015/01/22 11:16:56 jsing 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 | * |
@@ -71,16 +71,16 @@ | |||
71 | static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **); | 71 | static int by_mem_ctrl(X509_LOOKUP *, int, const char *, long, char **); |
72 | 72 | ||
73 | X509_LOOKUP_METHOD x509_mem_lookup = { | 73 | X509_LOOKUP_METHOD x509_mem_lookup = { |
74 | "Load cert from memory", | 74 | .name = "Load cert from memory", |
75 | NULL, /* new */ | 75 | .new_item = NULL, |
76 | NULL, /* free */ | 76 | .free = NULL, |
77 | NULL, /* init */ | 77 | .init = NULL, |
78 | NULL, /* shutdown */ | 78 | .shutdown = NULL, |
79 | by_mem_ctrl, /* ctrl */ | 79 | .ctrl = by_mem_ctrl, |
80 | NULL, /* get_by_subject */ | 80 | .get_by_subject = NULL, |
81 | NULL, /* get_by_issuer_serial */ | 81 | .get_by_issuer_serial = NULL, |
82 | NULL, /* get_by_fingerprint */ | 82 | .get_by_fingerprint = NULL, |
83 | NULL, /* get_by_alias */ | 83 | .get_by_alias = NULL, |
84 | }; | 84 | }; |
85 | 85 | ||
86 | X509_LOOKUP_METHOD * | 86 | X509_LOOKUP_METHOD * |