projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT3959: Fix misleading comment
[openssl.git]
/
apps
/
ecparam.c
diff --git
a/apps/ecparam.c
b/apps/ecparam.c
index 5ceaec79b257bccec47c2b3d37aa52c42f2bb6c8..8464c882ca0f0206f5cb0c0f1bc731080910c86c 100644
(file)
--- a/
apps/ecparam.c
+++ b/
apps/ecparam.c
@@
-70,7
+70,6
@@
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_EC
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_EC
-# include <assert.h>
# include <stdio.h>
# include <stdlib.h>
# include <time.h>
# include <stdio.h>
# include <stdlib.h>
# include <time.h>
@@
-142,8
+141,8
@@
int ecparam_main(int argc, char **argv)
unsigned char *buffer = NULL;
OPTION_CHOICE o;
int asn1_flag = OPENSSL_EC_NAMED_CURVE, new_asn1_flag = 0;
unsigned char *buffer = NULL;
OPTION_CHOICE o;
int asn1_flag = OPENSSL_EC_NAMED_CURVE, new_asn1_flag = 0;
- int informat = FORMAT_PEM, outformat = FORMAT_PEM, noout = 0, C = 0
, ret =
-
1
;
+ int informat = FORMAT_PEM, outformat = FORMAT_PEM, noout = 0, C = 0
;
+
int ret = 1, private = 0
;
int list_curves = 0, no_seed = 0, check = 0, new_form = 0;
int text = 0, i, need_rand = 0, genkey = 0;
int list_curves = 0, no_seed = 0, check = 0, new_form = 0;
int text = 0, i, need_rand = 0, genkey = 0;
@@
-219,11
+218,15
@@
int ecparam_main(int argc, char **argv)
}
argc = opt_num_rest();
argv = opt_rest();
}
argc = opt_num_rest();
argv = opt_rest();
+ private = genkey ? 1 : 0;
+
+ if (!app_load_modules(NULL))
+ goto end;
in = bio_open_default(infile, RB(informat));
if (in == NULL)
goto end;
in = bio_open_default(infile, RB(informat));
if (in == NULL)
goto end;
- out = bio_open_
default(outfile, WB(outformat)
);
+ out = bio_open_
owner(outfile, WB(outformat), private
);
if (out == NULL)
goto end;
if (out == NULL)
goto end;
@@
-265,11
+268,11
@@
int ecparam_main(int argc, char **argv)
* are the same as the curves prime192v1 and prime256v1 defined in
* X9.62)
*/
* are the same as the curves prime192v1 and prime256v1 defined in
* X9.62)
*/
- if (
!strcmp(curve_name, "secp192r1")
) {
+ if (
strcmp(curve_name, "secp192r1") == 0
) {
BIO_printf(bio_err, "using curve name prime192v1 "
"instead of secp192r1\n");
nid = NID_X9_62_prime192v1;
BIO_printf(bio_err, "using curve name prime192v1 "
"instead of secp192r1\n");
nid = NID_X9_62_prime192v1;
- } else if (
!strcmp(curve_name, "secp256r1")
) {
+ } else if (
strcmp(curve_name, "secp256r1") == 0
) {
BIO_printf(bio_err, "using curve name prime256v1 "
"instead of secp256r1\n");
nid = NID_X9_62_prime256v1;
BIO_printf(bio_err, "using curve name prime256v1 "
"instead of secp256r1\n");
nid = NID_X9_62_prime256v1;
@@
-323,8
+326,9
@@
int ecparam_main(int argc, char **argv)
if (!EC_GROUP_check(group, NULL)) {
BIO_printf(bio_err, "failed\n");
ERR_print_errors(bio_err);
if (!EC_GROUP_check(group, NULL)) {
BIO_printf(bio_err, "failed\n");
ERR_print_errors(bio_err);
- } else
- BIO_printf(bio_err, "ok\n");
+ goto end;
+ }
+ BIO_printf(bio_err, "ok\n");
}
}
@@
-470,6
+474,7
@@
int ecparam_main(int argc, char **argv)
EC_KEY_free(eckey);
goto end;
}
EC_KEY_free(eckey);
goto end;
}
+ assert(private);
if (outformat == FORMAT_ASN1)
i = i2d_ECPrivateKey_bio(out, eckey);
else
if (outformat == FORMAT_ASN1)
i = i2d_ECPrivateKey_bio(out, eckey);
else