diff options
Diffstat (limited to 'src/usr.bin/openssl/ecparam.c')
-rw-r--r-- | src/usr.bin/openssl/ecparam.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/usr.bin/openssl/ecparam.c b/src/usr.bin/openssl/ecparam.c index 1441fa7d2a..57797a8e4e 100644 --- a/src/usr.bin/openssl/ecparam.c +++ b/src/usr.bin/openssl/ecparam.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ecparam.c,v 1.6 2014/12/14 14:45:33 jsing Exp $ */ | 1 | /* $OpenBSD: ecparam.c,v 1.7 2014/12/28 14:21:42 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -111,7 +111,7 @@ static struct { | |||
111 | } ecparam_config; | 111 | } ecparam_config; |
112 | 112 | ||
113 | static int | 113 | static int |
114 | ecparam_opt_form(struct option *opt, char *arg) | 114 | ecparam_opt_form(char *arg) |
115 | { | 115 | { |
116 | if (strcmp(arg, "compressed") == 0) | 116 | if (strcmp(arg, "compressed") == 0) |
117 | ecparam_config.form = POINT_CONVERSION_COMPRESSED; | 117 | ecparam_config.form = POINT_CONVERSION_COMPRESSED; |
@@ -127,7 +127,7 @@ ecparam_opt_form(struct option *opt, char *arg) | |||
127 | } | 127 | } |
128 | 128 | ||
129 | static int | 129 | static int |
130 | ecparam_opt_enctype(struct option *opt, char *arg) | 130 | ecparam_opt_enctype(char *arg) |
131 | { | 131 | { |
132 | if (strcmp(arg, "explicit") == 0) | 132 | if (strcmp(arg, "explicit") == 0) |
133 | ecparam_config.asn1_flag = 0; | 133 | ecparam_config.asn1_flag = 0; |
@@ -159,7 +159,7 @@ struct option ecparam_options[] = { | |||
159 | .desc = "Specify point conversion form:\n" | 159 | .desc = "Specify point conversion form:\n" |
160 | " compressed, uncompressed (default), hybrid", | 160 | " compressed, uncompressed (default), hybrid", |
161 | .type = OPTION_ARG_FUNC, | 161 | .type = OPTION_ARG_FUNC, |
162 | .func = ecparam_opt_form, | 162 | .opt.argfunc = ecparam_opt_form, |
163 | }, | 163 | }, |
164 | #ifndef OPENSSL_NO_ENGINE | 164 | #ifndef OPENSSL_NO_ENGINE |
165 | { | 165 | { |
@@ -237,7 +237,7 @@ struct option ecparam_options[] = { | |||
237 | .desc = "Specify EC parameter ASN.1 encoding type:\n" | 237 | .desc = "Specify EC parameter ASN.1 encoding type:\n" |
238 | " explicit, named_curve (default)", | 238 | " explicit, named_curve (default)", |
239 | .type = OPTION_ARG_FUNC, | 239 | .type = OPTION_ARG_FUNC, |
240 | .func = ecparam_opt_enctype, | 240 | .opt.argfunc = ecparam_opt_enctype, |
241 | }, | 241 | }, |
242 | { | 242 | { |
243 | .name = "text", | 243 | .name = "text", |