summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-02-04 14:47:40 +0000
committerDr. Stephen Henson <steve@openssl.org>2016-02-04 15:28:33 +0000
commit7565cbc4d7b8cdec7d66fd799c7e892b7a5a8183 (patch)
tree2def357e59f26ffda312a53c9c9bfef471ef863f
parent947f9da1019a8942e716cdcd44db211992aec295 (diff)
Add ec -check option
Reviewed-by: Andy Polyakov <appro@openssl.org>
-rw-r--r--apps/ec.c17
-rw-r--r--doc/apps/ec.pod5
2 files changed, 20 insertions, 2 deletions
diff --git a/apps/ec.c b/apps/ec.c
index a0a96b7ab4..a3fecd412a 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -84,7 +84,7 @@ typedef enum OPTION_choice {
OPT_INFORM, OPT_OUTFORM, OPT_ENGINE, OPT_IN, OPT_OUT,
OPT_NOOUT, OPT_TEXT, OPT_PARAM_OUT, OPT_PUBIN, OPT_PUBOUT,
OPT_PASSIN, OPT_PASSOUT, OPT_PARAM_ENC, OPT_CONV_FORM, OPT_CIPHER,
- OPT_NO_PUBLIC
+ OPT_NO_PUBLIC, OPT_CHECK
} OPTION_CHOICE;
OPTIONS ec_options[] = {
@@ -99,6 +99,7 @@ OPTIONS ec_options[] = {
{"pubin", OPT_PUBIN, '-'},
{"pubout", OPT_PUBOUT, '-'},
{"no_public", OPT_NO_PUBLIC, '-', "exclude public key from private key"},
+ {"check", OPT_CHECK, '-', "check key consistency"},
{"passin", OPT_PASSIN, 's', "Input file pass phrase source"},
{"passout", OPT_PASSOUT, 's', "Output file pass phrase source"},
{"param_enc", OPT_PARAM_ENC, 's',
@@ -124,7 +125,7 @@ int ec_main(int argc, char **argv)
int asn1_flag = OPENSSL_EC_NAMED_CURVE, new_form = 0, new_asn1_flag = 0;
int informat = FORMAT_PEM, outformat = FORMAT_PEM, text = 0, noout = 0;
int pubin = 0, pubout = 0, param_out = 0, i, ret = 1, private = 0;
- int no_public = 0;
+ int no_public = 0, check = 0;
prog = opt_init(argc, argv, ec_options);
while ((o = opt_next()) != OPT_EOF) {
@@ -195,6 +196,9 @@ int ec_main(int argc, char **argv)
case OPT_NO_PUBLIC:
no_public = 1;
break;
+ case OPT_CHECK:
+ check = 1;
+ break;
}
}
argc = opt_num_rest();
@@ -254,6 +258,15 @@ int ec_main(int argc, char **argv)
}
}
+ if (check) {
+ if (EC_KEY_check_key(eckey) == 1) {
+ BIO_printf(bio_err, "EC Key valid.\n");
+ } else {
+ BIO_printf(bio_err, "EC Key Invalid!\n");
+ ERR_print_errors(bio_err);
+ }
+ }
+
if (noout) {
ret = 0;
goto end;
diff --git a/doc/apps/ec.pod b/doc/apps/ec.pod
index 0c42d46cf5..b8ea645ba3 100644
--- a/doc/apps/ec.pod
+++ b/doc/apps/ec.pod
@@ -24,6 +24,7 @@ B<openssl> B<ec>
[B<-conv_form arg>]
[B<-param_enc arg>]
[B<-no_public>]
+[B<-check>]
[B<-engine id>]
=head1 DESCRIPTION
@@ -133,6 +134,10 @@ is currently not implemented in OpenSSL.
This option omits the public key components from the private key output.
+=item B<-check>
+
+this option checks the consistency of an EC private or public key.
+
=item B<-engine id>
specifying an engine (by its unique B<id> string) will cause B<ec>