projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update FAQ
[openssl.git]
/
apps
/
ec.c
diff --git
a/apps/ec.c
b/apps/ec.c
index 9ddaddfe5e7033858f749b7c52f359e9d7a7462b..896eabc13fba53a1f0e677f8b3952fe9ab7abe33 100644
(file)
--- a/
apps/ec.c
+++ b/
apps/ec.c
@@
-85,9
+85,6
@@
int MAIN(int, char **);
int MAIN(int argc, char **argv)
{
int MAIN(int argc, char **argv)
{
-#ifndef OPENSSL_NO_ENGINE
- ENGINE *e = NULL;
-#endif
int ret = 1;
EC_KEY *eckey = NULL;
const EC_GROUP *group;
int ret = 1;
EC_KEY *eckey = NULL;
const EC_GROUP *group;
@@
-244,7
+241,7
@@
bad:
" the ec parameters are encoded\n");
BIO_printf(bio_err, " in the asn1 der "
"encoding\n");
" the ec parameters are encoded\n");
BIO_printf(bio_err, " in the asn1 der "
"encoding\n");
- BIO_printf(bio_err, " possi
lb
e values:"
+ BIO_printf(bio_err, " possi
bl
e values:"
" named_curve (default)\n");
BIO_printf(bio_err," "
"explicit\n");
" named_curve (default)\n");
BIO_printf(bio_err," "
"explicit\n");
@@
-254,7
+251,7
@@
bad:
ERR_load_crypto_strings();
#ifndef OPENSSL_NO_ENGINE
ERR_load_crypto_strings();
#ifndef OPENSSL_NO_ENGINE
-
e =
setup_engine(bio_err, engine, 0);
+ setup_engine(bio_err, engine, 0);
#endif
if(!app_passwd(bio_err, passargin, passargout, &passin, &passout))
#endif
if(!app_passwd(bio_err, passargin, passargout, &passin, &passout))
@@
-347,7
+344,10
@@
bad:
}
if (noout)
}
if (noout)
+ {
+ ret = 0;
goto end;
goto end;
+ }
BIO_printf(bio_err, "writing EC key\n");
if (outformat == FORMAT_ASN1)
BIO_printf(bio_err, "writing EC key\n");
if (outformat == FORMAT_ASN1)
@@
-397,4
+397,10
@@
end:
apps_shutdown();
OPENSSL_EXIT(ret);
}
apps_shutdown();
OPENSSL_EXIT(ret);
}
+#else /* !OPENSSL_NO_EC */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
#endif
#endif