1d0
< /* apps/ecparam.c */
3,6c2
< * Written by Nils Larsch for the OpenSSL project.
< */
< /* ====================================================================
< * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
---
> * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
8,56c4,7
< * Redistribution and use in source and binary forms, with or without
< * modification, are permitted provided that the following conditions
< * are met:
< *
< * 1. Redistributions of source code must retain the above copyright
< * notice, this list of conditions and the following disclaimer.
< *
< * 2. Redistributions in binary form must reproduce the above copyright
< * notice, this list of conditions and the following disclaimer in
< * the documentation and/or other materials provided with the
< * distribution.
< *
< * 3. All advertising materials mentioning features or use of this
< * software must display the following acknowledgment:
< * "This product includes software developed by the OpenSSL Project
< * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
< *
< * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
< * endorse or promote products derived from this software without
< * prior written permission. For written permission, please contact
< * openssl-core@openssl.org.
< *
< * 5. Products derived from this software may not be called "OpenSSL"
< * nor may "OpenSSL" appear in their names without prior written
< * permission of the OpenSSL Project.
< *
< * 6. Redistributions of any form whatsoever must retain the following
< * acknowledgment:
< * "This product includes software developed by the OpenSSL Project
< * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
< *
< * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
< * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
< * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
< * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
< * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
< * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
< * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
< * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
< * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
< * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
< * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
< * OF THE POSSIBILITY OF SUCH DAMAGE.
< * ====================================================================
< *
< * This product includes cryptographic software written by Eric Young
< * (eay@cryptsoft.com). This product includes software written by Tim
< * Hudson (tjh@cryptsoft.com).
< *
---
> * Licensed under the OpenSSL license (the "License"). You may not use
> * this file except in compliance with the License. You can obtain a copy
> * in the file LICENSE in the source distribution or at
> * https://www.openssl.org/source/license.html
57a9
>
73,74c25,28
< #ifndef OPENSSL_NO_EC
< # include <assert.h>
---
> #ifdef OPENSSL_NO_EC
> NON_EMPTY_TRANSLATION_UNIT
> #else
>
87,88c41,46
< # undef PROG
< # define PROG ecparam_main
---
> typedef enum OPTION_choice {
> OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
> OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_TEXT, OPT_C,
> OPT_CHECK, OPT_LIST_CURVES, OPT_NO_SEED, OPT_NOOUT, OPT_NAME,
> OPT_CONV_FORM, OPT_PARAM_ENC, OPT_GENKEY, OPT_RAND, OPT_ENGINE
> } OPTION_CHOICE;
90,113c48,73
< /*-
< * -inform arg - input format - default PEM (DER or PEM)
< * -outform arg - output format - default PEM
< * -in arg - input file - default stdin
< * -out arg - output file - default stdout
< * -noout - do not print the ec parameter
< * -text - print the ec parameters in text form
< * -check - validate the ec parameters
< * -C - print a 'C' function creating the parameters
< * -name arg - use the ec parameters with 'short name' name
< * -list_curves - prints a list of all currently available curve 'short names'
< * -conv_form arg - specifies the point conversion form
< * - possible values: compressed
< * uncompressed (default)
< * hybrid
< * -param_enc arg - specifies the way the ec parameters are encoded
< * in the asn1 der encoding
< * possible values: named_curve (default)
< * explicit
< * -no_seed - if 'explicit' parameters are chosen do not use the seed
< * -genkey - generate ec key
< * -rand file - files to use for random number input
< * -engine e - use engine e, possibly a hardware device
< */
---
> OPTIONS ecparam_options[] = {
> {"help", OPT_HELP, '-', "Display this summary"},
> {"inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)"},
> {"outform", OPT_OUTFORM, 'F', "Output format - default PEM"},
> {"in", OPT_IN, '<', "Input file - default stdin"},
> {"out", OPT_OUT, '>', "Output file - default stdout"},
> {"text", OPT_TEXT, '-', "Print the ec parameters in text form"},
> {"C", OPT_C, '-', "Print a 'C' function creating the parameters"},
> {"check", OPT_CHECK, '-', "Validate the ec parameters"},
> {"list_curves", OPT_LIST_CURVES, '-',
> "Prints a list of all curve 'short names'"},
> {"no_seed", OPT_NO_SEED, '-',
> "If 'explicit' parameters are chosen do not use the seed"},
> {"noout", OPT_NOOUT, '-', "Do not print the ec parameter"},
> {"name", OPT_NAME, 's',
> "Use the ec parameters with specified 'short name'"},
> {"conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form "},
> {"param_enc", OPT_PARAM_ENC, 's',
> "Specifies the way the ec parameters are encoded"},
> {"genkey", OPT_GENKEY, '-', "Generate ec key"},
> {"rand", OPT_RAND, 's', "Files to use for random number input"},
> # ifndef OPENSSL_NO_ENGINE
> {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
> # endif
> {NULL}
> };
115,116c75,80
< static int ecparam_print_var(BIO *, BIGNUM *, const char *, int,
< unsigned char *);
---
> static OPT_PAIR forms[] = {
> {"compressed", POINT_CONVERSION_COMPRESSED},
> {"uncompressed", POINT_CONVERSION_UNCOMPRESSED},
> {"hybrid", POINT_CONVERSION_HYBRID},
> {NULL}
> };
118c82,86
< int MAIN(int, char **);
---
> static OPT_PAIR encodings[] = {
> {"named_curve", OPENSSL_EC_NAMED_CURVE},
> {"explicit", 0},
> {NULL}
> };
120c88
< int MAIN(int argc, char **argv)
---
> int ecparam_main(int argc, char **argv)
121a90,93
> ENGINE *e = NULL;
> BIGNUM *ec_gen = NULL, *ec_order = NULL, *ec_cofactor = NULL;
> BIGNUM *ec_p = NULL, *ec_a = NULL, *ec_b = NULL;
> BIO *in = NULL, *out = NULL;
124,126d95
< int new_form = 0;
< int asn1_flag = OPENSSL_EC_NAMED_CURVE;
< int new_asn1_flag = 0;
128,129d96
< int list_curves = 0, no_seed = 0, check = 0,
< badops = 0, text = 0, i, need_rand = 0, genkey = 0;
131,137d97
< BIO *in = NULL, *out = NULL;
< int informat, outformat, noout = 0, C = 0, ret = 1;
< char *engine = NULL;
< ENGINE *e = NULL;
<
< BIGNUM *ec_p = NULL, *ec_a = NULL, *ec_b = NULL,
< *ec_gen = NULL, *ec_order = NULL, *ec_cofactor = NULL;
138a99,104
> 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;
> 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;
140,172c106,132
< apps_startup();
<
< if (bio_err == NULL)
< if ((bio_err = BIO_new(BIO_s_file())) != NULL)
< BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
<
< if (!load_config(bio_err, NULL))
< goto end;
<
< informat = FORMAT_PEM;
< outformat = FORMAT_PEM;
<
< prog = argv[0];
< argc--;
< argv++;
< while (argc >= 1) {
< if (strcmp(*argv, "-inform") == 0) {
< if (--argc < 1)
< goto bad;
< informat = str2fmt(*(++argv));
< } else if (strcmp(*argv, "-outform") == 0) {
< if (--argc < 1)
< goto bad;
< outformat = str2fmt(*(++argv));
< } else if (strcmp(*argv, "-in") == 0) {
< if (--argc < 1)
< goto bad;
< infile = *(++argv);
< } else if (strcmp(*argv, "-out") == 0) {
< if (--argc < 1)
< goto bad;
< outfile = *(++argv);
< } else if (strcmp(*argv, "-text") == 0)
---
> prog = opt_init(argc, argv, ecparam_options);
> while ((o = opt_next()) != OPT_EOF) {
> switch (o) {
> case OPT_EOF:
> case OPT_ERR:
> opthelp:
> BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
> goto end;
> case OPT_HELP:
> opt_help(ecparam_options);
> ret = 0;
> goto end;
> case OPT_INFORM:
> if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
> goto opthelp;
> break;
> case OPT_IN:
> infile = opt_arg();
> break;
> case OPT_OUTFORM:
> if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
> goto opthelp;
> break;
> case OPT_OUT:
> outfile = opt_arg();
> break;
> case OPT_TEXT:
174c134,135
< else if (strcmp(*argv, "-C") == 0)
---
> break;
> case OPT_C:
176c137,138
< else if (strcmp(*argv, "-check") == 0)
---
> break;
> case OPT_CHECK:
178,182c140,141
< else if (strcmp(*argv, "-name") == 0) {
< if (--argc < 1)
< goto bad;
< curve_name = *(++argv);
< } else if (strcmp(*argv, "-list_curves") == 0)
---
> break;
> case OPT_LIST_CURVES:
184,208c143,144
< else if (strcmp(*argv, "-conv_form") == 0) {
< if (--argc < 1)
< goto bad;
< ++argv;
< new_form = 1;
< if (strcmp(*argv, "compressed") == 0)
< form = POINT_CONVERSION_COMPRESSED;
< else if (strcmp(*argv, "uncompressed") == 0)
< form = POINT_CONVERSION_UNCOMPRESSED;
< else if (strcmp(*argv, "hybrid") == 0)
< form = POINT_CONVERSION_HYBRID;
< else
< goto bad;
< } else if (strcmp(*argv, "-param_enc") == 0) {
< if (--argc < 1)
< goto bad;
< ++argv;
< new_asn1_flag = 1;
< if (strcmp(*argv, "named_curve") == 0)
< asn1_flag = OPENSSL_EC_NAMED_CURVE;
< else if (strcmp(*argv, "explicit") == 0)
< asn1_flag = 0;
< else
< goto bad;
< } else if (strcmp(*argv, "-no_seed") == 0)
---
> break;
> case OPT_NO_SEED:
210c146,147
< else if (strcmp(*argv, "-noout") == 0)
---
> break;
> case OPT_NOOUT:
212,213c149,168
< else if (strcmp(*argv, "-genkey") == 0) {
< genkey = 1;
---
> break;
> case OPT_NAME:
> curve_name = opt_arg();
> break;
> case OPT_CONV_FORM:
> if (!opt_pair(opt_arg(), forms, &new_form))
> goto opthelp;
> form = new_form;
> new_form = 1;
> break;
> case OPT_PARAM_ENC:
> if (!opt_pair(opt_arg(), encodings, &asn1_flag))
> goto opthelp;
> new_asn1_flag = 1;
> break;
> case OPT_GENKEY:
> genkey = need_rand = 1;
> break;
> case OPT_RAND:
> inrand = opt_arg();
215,226d169
< } else if (strcmp(*argv, "-rand") == 0) {
< if (--argc < 1)
< goto bad;
< inrand = *(++argv);
< need_rand = 1;
< } else if (strcmp(*argv, "-engine") == 0) {
< if (--argc < 1)
< goto bad;
< engine = *(++argv);
< } else {
< BIO_printf(bio_err, "unknown option %s\n", *argv);
< badops = 1;
227a171,173
> case OPT_ENGINE:
> e = setup_engine(opt_arg(), 0);
> break;
229,230d174
< argc--;
< argv++;
231a176,178
> argc = opt_num_rest();
> if (argc != 0)
> goto opthelp;
233,281c180
< if (badops) {
< bad:
< BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
< BIO_printf(bio_err, "where options are\n");
< BIO_printf(bio_err, " -inform arg input format - "
< "default PEM (DER or PEM)\n");
< BIO_printf(bio_err, " -outform arg output format - "
< "default PEM\n");
< BIO_printf(bio_err, " -in arg input file - "
< "default stdin\n");
< BIO_printf(bio_err, " -out arg output file - "
< "default stdout\n");
< BIO_printf(bio_err, " -noout do not print the "
< "ec parameter\n");
< BIO_printf(bio_err, " -text print the ec "
< "parameters in text form\n");
< BIO_printf(bio_err, " -check validate the ec "
< "parameters\n");
< BIO_printf(bio_err, " -C print a 'C' "
< "function creating the parameters\n");
< BIO_printf(bio_err, " -name arg use the "
< "ec parameters with 'short name' name\n");
< BIO_printf(bio_err, " -list_curves prints a list of "
< "all currently available curve 'short names'\n");
< BIO_printf(bio_err, " -conv_form arg specifies the "
< "point conversion form \n");
< BIO_printf(bio_err, " possible values:"
< " compressed\n");
< BIO_printf(bio_err, " "
< " uncompressed (default)\n");
< BIO_printf(bio_err, " "
< " hybrid\n");
< BIO_printf(bio_err, " -param_enc arg specifies the way"
< " the ec parameters are encoded\n");
< BIO_printf(bio_err, " in the asn1 der "
< "encoding\n");
< BIO_printf(bio_err, " possible values:"
< " named_curve (default)\n");
< BIO_printf(bio_err, " "
< " explicit\n");
< BIO_printf(bio_err, " -no_seed if 'explicit'"
< " parameters are chosen do not" " use the seed\n");
< BIO_printf(bio_err, " -genkey generate ec" " key\n");
< BIO_printf(bio_err, " -rand file files to use for"
< " random number input\n");
< BIO_printf(bio_err, " -engine e use engine e, "
< "possibly a hardware device\n");
< goto end;
< }
---
> private = genkey ? 1 : 0;
283,288c182,183
< ERR_load_crypto_strings();
<
< in = BIO_new(BIO_s_file());
< out = BIO_new(BIO_s_file());
< if ((in == NULL) || (out == NULL)) {
< ERR_print_errors(bio_err);
---
> in = bio_open_default(infile, 'r', informat);
> if (in == NULL)
290c185,187
< }
---
> out = bio_open_owner(outfile, outformat, private);
> if (out == NULL)
> goto end;
292,316d188
< if (infile == NULL)
< BIO_set_fp(in, stdin, BIO_NOCLOSE);
< else {
< if (BIO_read_filename(in, infile) <= 0) {
< perror(infile);
< goto end;
< }
< }
< if (outfile == NULL) {
< BIO_set_fp(out, stdout, BIO_NOCLOSE);
< # ifdef OPENSSL_SYS_VMS
< {
< BIO *tmpbio = BIO_new(BIO_f_linebuffer());
< out = BIO_push(tmpbio, out);
< }
< # endif
< } else {
< if (BIO_write_filename(out, outfile) <= 0) {
< perror(outfile);
< goto end;
< }
< }
<
< e = setup_engine(bio_err, engine, 0);
<
319,320c191,192
< size_t crv_len = 0;
< size_t n = 0;
---
> size_t crv_len = EC_get_builtin_curves(NULL, 0);
> size_t n;
322,328c194
< crv_len = EC_get_builtin_curves(NULL, 0);
<
< curves = OPENSSL_malloc((int)(sizeof(EC_builtin_curve) * crv_len));
<
< if (curves == NULL)
< goto end;
<
---
> curves = app_malloc((int)sizeof(*curves) * crv_len, "list curves");
361c227
< if (!strcmp(curve_name, "secp192r1")) {
---
> if (strcmp(curve_name, "secp192r1") == 0) {
365c231
< } else if (!strcmp(curve_name, "secp256r1")) {
---
> } else if (strcmp(curve_name, "secp256r1") == 0) {
387c253
< } else if (informat == FORMAT_ASN1) {
---
> } else if (informat == FORMAT_ASN1)
389c255
< } else if (informat == FORMAT_PEM) {
---
> else
391,395d256
< } else {
< BIO_printf(bio_err, "bad input format specified\n");
< goto end;
< }
<
434,438c295,301
< if ((ec_p = BN_new()) == NULL || (ec_a = BN_new()) == NULL ||
< (ec_b = BN_new()) == NULL || (ec_gen = BN_new()) == NULL ||
< (ec_order = BN_new()) == NULL ||
< (ec_cofactor = BN_new()) == NULL) {
< perror("OPENSSL_malloc");
---
> if ((ec_p = BN_new()) == NULL
> || (ec_a = BN_new()) == NULL
> || (ec_b = BN_new()) == NULL
> || (ec_gen = BN_new()) == NULL
> || (ec_order = BN_new()) == NULL
> || (ec_cofactor = BN_new()) == NULL) {
> perror("Can't allocate BN");
443,448c306,307
<
< if (is_prime) {
< if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a, ec_b, NULL))
< goto end;
< } else {
< /* TODO */
---
> if (!is_prime) {
> BIO_printf(bio_err, "Can only handle X9.62 prime fields\n");
451a311,313
> if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a, ec_b, NULL))
> goto end;
>
481c343
< buffer = (unsigned char *)OPENSSL_malloc(buf_len);
---
> buffer = app_malloc(buf_len, "BN buffer");
483,486c345,358
< if (buffer == NULL) {
< perror("OPENSSL_malloc");
< goto end;
< }
---
> BIO_printf(out, "EC_GROUP *get_ec_group_%d(void)\n{\n", len);
> print_bignum_var(out, ec_p, "ec_p", len, buffer);
> print_bignum_var(out, ec_a, "ec_a", len, buffer);
> print_bignum_var(out, ec_b, "ec_b", len, buffer);
> print_bignum_var(out, ec_gen, "ec_gen", len, buffer);
> print_bignum_var(out, ec_order, "ec_order", len, buffer);
> print_bignum_var(out, ec_cofactor, "ec_cofactor", len, buffer);
> BIO_printf(out, " int ok = 0;\n"
> " EC_GROUP *group = NULL;\n"
> " EC_POINT *point = NULL;\n"
> " BIGNUM *tmp_1 = NULL;\n"
> " BIGNUM *tmp_2 = NULL;\n"
> " BIGNUM *tmp_3 = NULL;\n"
> "\n");
488,546c360,393
< ecparam_print_var(out, ec_p, "ec_p", len, buffer);
< ecparam_print_var(out, ec_a, "ec_a", len, buffer);
< ecparam_print_var(out, ec_b, "ec_b", len, buffer);
< ecparam_print_var(out, ec_gen, "ec_gen", len, buffer);
< ecparam_print_var(out, ec_order, "ec_order", len, buffer);
< ecparam_print_var(out, ec_cofactor, "ec_cofactor", len, buffer);
<
< BIO_printf(out, "\n\n");
<
< BIO_printf(out, "EC_GROUP *get_ec_group_%d(void)\n\t{\n", len);
< BIO_printf(out, "\tint ok=0;\n");
< BIO_printf(out, "\tEC_GROUP *group = NULL;\n");
< BIO_printf(out, "\tEC_POINT *point = NULL;\n");
< BIO_printf(out, "\tBIGNUM *tmp_1 = NULL, *tmp_2 = NULL, "
< "*tmp_3 = NULL;\n\n");
< BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_p_%d, "
< "sizeof(ec_p_%d), NULL)) == NULL)\n\t\t"
< "goto err;\n", len, len);
< BIO_printf(out, "\tif ((tmp_2 = BN_bin2bn(ec_a_%d, "
< "sizeof(ec_a_%d), NULL)) == NULL)\n\t\t"
< "goto err;\n", len, len);
< BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_b_%d, "
< "sizeof(ec_b_%d), NULL)) == NULL)\n\t\t"
< "goto err;\n", len, len);
< if (is_prime) {
< BIO_printf(out, "\tif ((group = EC_GROUP_new_curve_"
< "GFp(tmp_1, tmp_2, tmp_3, NULL)) == NULL)"
< "\n\t\tgoto err;\n\n");
< } else {
< /* TODO */
< goto end;
< }
< BIO_printf(out, "\t/* build generator */\n");
< BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_gen_%d, "
< "sizeof(ec_gen_%d), tmp_1)) == NULL)"
< "\n\t\tgoto err;\n", len, len);
< BIO_printf(out, "\tpoint = EC_POINT_bn2point(group, tmp_1, "
< "NULL, NULL);\n");
< BIO_printf(out, "\tif (point == NULL)\n\t\tgoto err;\n");
< BIO_printf(out, "\tif ((tmp_2 = BN_bin2bn(ec_order_%d, "
< "sizeof(ec_order_%d), tmp_2)) == NULL)"
< "\n\t\tgoto err;\n", len, len);
< BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_cofactor_%d, "
< "sizeof(ec_cofactor_%d), tmp_3)) == NULL)"
< "\n\t\tgoto err;\n", len, len);
< BIO_printf(out, "\tif (!EC_GROUP_set_generator(group, point,"
< " tmp_2, tmp_3))\n\t\tgoto err;\n");
< BIO_printf(out, "\n\tok=1;\n");
< BIO_printf(out, "err:\n");
< BIO_printf(out, "\tif (tmp_1)\n\t\tBN_free(tmp_1);\n");
< BIO_printf(out, "\tif (tmp_2)\n\t\tBN_free(tmp_2);\n");
< BIO_printf(out, "\tif (tmp_3)\n\t\tBN_free(tmp_3);\n");
< BIO_printf(out, "\tif (point)\n\t\tEC_POINT_free(point);\n");
< BIO_printf(out, "\tif (!ok)\n");
< BIO_printf(out, "\t\t{\n");
< BIO_printf(out, "\t\tEC_GROUP_free(group);\n");
< BIO_printf(out, "\t\tgroup = NULL;\n");
< BIO_printf(out, "\t\t}\n");
< BIO_printf(out, "\treturn(group);\n\t}\n");
---
> BIO_printf(out, " if ((tmp_1 = BN_bin2bn(ec_p_%d, sizeof (ec_p_%d), NULL)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " if ((tmp_2 = BN_bin2bn(ec_a_%d, sizeof (ec_a_%d), NULL)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " if ((tmp_3 = BN_bin2bn(ec_b_%d, sizeof (ec_b_%d), NULL)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " if ((group = EC_GROUP_new_curve_GFp(tmp_1, tmp_2, tmp_3, NULL)) == NULL)\n"
> " goto err;\n"
> "\n");
> BIO_printf(out, " /* build generator */\n");
> BIO_printf(out, " if ((tmp_1 = BN_bin2bn(ec_gen_%d, sizeof (ec_gen_%d), tmp_1)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " point = EC_POINT_bn2point(group, tmp_1, NULL, NULL);\n");
> BIO_printf(out, " if (point == NULL)\n"
> " goto err;\n");
> BIO_printf(out, " if ((tmp_2 = BN_bin2bn(ec_order_%d, sizeof (ec_order_%d), tmp_2)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " if ((tmp_3 = BN_bin2bn(ec_cofactor_%d, sizeof (ec_cofactor_%d), tmp_3)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " if (!EC_GROUP_set_generator(group, point, tmp_2, tmp_3))\n"
> " goto err;\n"
> "ok = 1;"
> "\n");
> BIO_printf(out, "err:\n"
> " BN_free(tmp_1);\n"
> " BN_free(tmp_2);\n"
> " BN_free(tmp_3);\n"
> " EC_POINT_free(point);\n"
> " if (!ok) {\n"
> " EC_GROUP_free(group);\n"
> " return NULL;\n"
> " }\n"
> " return (group);\n"
> "}\n");
552c399
< else if (outformat == FORMAT_PEM)
---
> else
554,558d400
< else {
< BIO_printf(bio_err, "bad output format specified for"
< " outfile\n");
< goto end;
< }
568c410
< app_RAND_load_file(NULL, bio_err, (inrand != NULL));
---
> app_RAND_load_file(NULL, (inrand != NULL));
582c424,427
< if (EC_KEY_set_group(eckey, group) == 0)
---
> if (EC_KEY_set_group(eckey, group) == 0) {
> BIO_printf(bio_err, "unable to set group when generating key\n");
> EC_KEY_free(eckey);
> ERR_print_errors(bio_err);
583a429
> }
585a432
> BIO_printf(bio_err, "unable to generate key\n");
586a434
> ERR_print_errors(bio_err);
588a437
> assert(private);
591c440
< else if (outformat == FORMAT_PEM)
---
> else
594,599d442
< else {
< BIO_printf(bio_err, "bad output format specified "
< "for outfile\n");
< EC_KEY_free(eckey);
< goto end;
< }
604c447
< app_RAND_write_file(NULL, bio_err);
---
> app_RAND_write_file(NULL);
608,623c451,458
< if (ec_p)
< BN_free(ec_p);
< if (ec_a)
< BN_free(ec_a);
< if (ec_b)
< BN_free(ec_b);
< if (ec_gen)
< BN_free(ec_gen);
< if (ec_order)
< BN_free(ec_order);
< if (ec_cofactor)
< BN_free(ec_cofactor);
< if (buffer)
< OPENSSL_free(buffer);
< if (group != NULL)
< EC_GROUP_free(group);
---
> BN_free(ec_p);
> BN_free(ec_a);
> BN_free(ec_b);
> BN_free(ec_gen);
> BN_free(ec_order);
> BN_free(ec_cofactor);
> OPENSSL_free(buffer);
> EC_GROUP_free(group);
625,630c460,462
< if (in != NULL)
< BIO_free(in);
< if (out != NULL)
< BIO_free_all(out);
< apps_shutdown();
< OPENSSL_EXIT(ret);
---
> BIO_free(in);
> BIO_free_all(out);
> return (ret);
633,660d464
< static int ecparam_print_var(BIO *out, BIGNUM *in, const char *var,
< int len, unsigned char *buffer)
< {
< BIO_printf(out, "static unsigned char %s_%d[] = {", var, len);
< if (BN_is_zero(in))
< BIO_printf(out, "\n\t0x00");
< else {
< int i, l;
<
< l = BN_bn2bin(in, buffer);
< for (i = 0; i < l - 1; i++) {
< if ((i % 12) == 0)
< BIO_printf(out, "\n\t");
< BIO_printf(out, "0x%02X,", buffer[i]);
< }
< if ((i % 12) == 0)
< BIO_printf(out, "\n\t");
< BIO_printf(out, "0x%02X", buffer[i]);
< }
< BIO_printf(out, "\n\t};\n\n");
< return 1;
< }
< #else /* !OPENSSL_NO_EC */
<
< # if PEDANTIC
< static void *dummy = &dummy;
< # endif
<
< /* apps/ecparam.c */
3,6c2
< * Written by Nils Larsch for the OpenSSL project.
< */
< /* ====================================================================
< * Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
---
> * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
8,56c4,7
< * Redistribution and use in source and binary forms, with or without
< * modification, are permitted provided that the following conditions
< * are met:
< *
< * 1. Redistributions of source code must retain the above copyright
< * notice, this list of conditions and the following disclaimer.
< *
< * 2. Redistributions in binary form must reproduce the above copyright
< * notice, this list of conditions and the following disclaimer in
< * the documentation and/or other materials provided with the
< * distribution.
< *
< * 3. All advertising materials mentioning features or use of this
< * software must display the following acknowledgment:
< * "This product includes software developed by the OpenSSL Project
< * for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
< *
< * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
< * endorse or promote products derived from this software without
< * prior written permission. For written permission, please contact
< * openssl-core@openssl.org.
< *
< * 5. Products derived from this software may not be called "OpenSSL"
< * nor may "OpenSSL" appear in their names without prior written
< * permission of the OpenSSL Project.
< *
< * 6. Redistributions of any form whatsoever must retain the following
< * acknowledgment:
< * "This product includes software developed by the OpenSSL Project
< * for use in the OpenSSL Toolkit (http://www.openssl.org/)"
< *
< * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
< * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
< * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
< * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
< * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
< * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
< * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
< * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
< * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
< * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
< * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
< * OF THE POSSIBILITY OF SUCH DAMAGE.
< * ====================================================================
< *
< * This product includes cryptographic software written by Eric Young
< * (eay@cryptsoft.com). This product includes software written by Tim
< * Hudson (tjh@cryptsoft.com).
< *
---
> * Licensed under the OpenSSL license (the "License"). You may not use
> * this file except in compliance with the License. You can obtain a copy
> * in the file LICENSE in the source distribution or at
> * https://www.openssl.org/source/license.html
57a9
>
73,74c25,28
< #ifndef OPENSSL_NO_EC
< # include <assert.h>
---
> #ifdef OPENSSL_NO_EC
> NON_EMPTY_TRANSLATION_UNIT
> #else
>
87,88c41,46
< # undef PROG
< # define PROG ecparam_main
---
> typedef enum OPTION_choice {
> OPT_ERR = -1, OPT_EOF = 0, OPT_HELP,
> OPT_INFORM, OPT_OUTFORM, OPT_IN, OPT_OUT, OPT_TEXT, OPT_C,
> OPT_CHECK, OPT_LIST_CURVES, OPT_NO_SEED, OPT_NOOUT, OPT_NAME,
> OPT_CONV_FORM, OPT_PARAM_ENC, OPT_GENKEY, OPT_RAND, OPT_ENGINE
> } OPTION_CHOICE;
90,113c48,73
< /*-
< * -inform arg - input format - default PEM (DER or PEM)
< * -outform arg - output format - default PEM
< * -in arg - input file - default stdin
< * -out arg - output file - default stdout
< * -noout - do not print the ec parameter
< * -text - print the ec parameters in text form
< * -check - validate the ec parameters
< * -C - print a 'C' function creating the parameters
< * -name arg - use the ec parameters with 'short name' name
< * -list_curves - prints a list of all currently available curve 'short names'
< * -conv_form arg - specifies the point conversion form
< * - possible values: compressed
< * uncompressed (default)
< * hybrid
< * -param_enc arg - specifies the way the ec parameters are encoded
< * in the asn1 der encoding
< * possible values: named_curve (default)
< * explicit
< * -no_seed - if 'explicit' parameters are chosen do not use the seed
< * -genkey - generate ec key
< * -rand file - files to use for random number input
< * -engine e - use engine e, possibly a hardware device
< */
---
> OPTIONS ecparam_options[] = {
> {"help", OPT_HELP, '-', "Display this summary"},
> {"inform", OPT_INFORM, 'F', "Input format - default PEM (DER or PEM)"},
> {"outform", OPT_OUTFORM, 'F', "Output format - default PEM"},
> {"in", OPT_IN, '<', "Input file - default stdin"},
> {"out", OPT_OUT, '>', "Output file - default stdout"},
> {"text", OPT_TEXT, '-', "Print the ec parameters in text form"},
> {"C", OPT_C, '-', "Print a 'C' function creating the parameters"},
> {"check", OPT_CHECK, '-', "Validate the ec parameters"},
> {"list_curves", OPT_LIST_CURVES, '-',
> "Prints a list of all curve 'short names'"},
> {"no_seed", OPT_NO_SEED, '-',
> "If 'explicit' parameters are chosen do not use the seed"},
> {"noout", OPT_NOOUT, '-', "Do not print the ec parameter"},
> {"name", OPT_NAME, 's',
> "Use the ec parameters with specified 'short name'"},
> {"conv_form", OPT_CONV_FORM, 's', "Specifies the point conversion form "},
> {"param_enc", OPT_PARAM_ENC, 's',
> "Specifies the way the ec parameters are encoded"},
> {"genkey", OPT_GENKEY, '-', "Generate ec key"},
> {"rand", OPT_RAND, 's', "Files to use for random number input"},
> # ifndef OPENSSL_NO_ENGINE
> {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
> # endif
> {NULL}
> };
115,116c75,80
< static int ecparam_print_var(BIO *, BIGNUM *, const char *, int,
< unsigned char *);
---
> static OPT_PAIR forms[] = {
> {"compressed", POINT_CONVERSION_COMPRESSED},
> {"uncompressed", POINT_CONVERSION_UNCOMPRESSED},
> {"hybrid", POINT_CONVERSION_HYBRID},
> {NULL}
> };
118c82,86
< int MAIN(int, char **);
---
> static OPT_PAIR encodings[] = {
> {"named_curve", OPENSSL_EC_NAMED_CURVE},
> {"explicit", 0},
> {NULL}
> };
120c88
< int MAIN(int argc, char **argv)
---
> int ecparam_main(int argc, char **argv)
121a90,93
> ENGINE *e = NULL;
> BIGNUM *ec_gen = NULL, *ec_order = NULL, *ec_cofactor = NULL;
> BIGNUM *ec_p = NULL, *ec_a = NULL, *ec_b = NULL;
> BIO *in = NULL, *out = NULL;
124,126d95
< int new_form = 0;
< int asn1_flag = OPENSSL_EC_NAMED_CURVE;
< int new_asn1_flag = 0;
128,129d96
< int list_curves = 0, no_seed = 0, check = 0,
< badops = 0, text = 0, i, need_rand = 0, genkey = 0;
131,137d97
< BIO *in = NULL, *out = NULL;
< int informat, outformat, noout = 0, C = 0, ret = 1;
< char *engine = NULL;
< ENGINE *e = NULL;
<
< BIGNUM *ec_p = NULL, *ec_a = NULL, *ec_b = NULL,
< *ec_gen = NULL, *ec_order = NULL, *ec_cofactor = NULL;
138a99,104
> 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;
> 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;
140,172c106,132
< apps_startup();
<
< if (bio_err == NULL)
< if ((bio_err = BIO_new(BIO_s_file())) != NULL)
< BIO_set_fp(bio_err, stderr, BIO_NOCLOSE | BIO_FP_TEXT);
<
< if (!load_config(bio_err, NULL))
< goto end;
<
< informat = FORMAT_PEM;
< outformat = FORMAT_PEM;
<
< prog = argv[0];
< argc--;
< argv++;
< while (argc >= 1) {
< if (strcmp(*argv, "-inform") == 0) {
< if (--argc < 1)
< goto bad;
< informat = str2fmt(*(++argv));
< } else if (strcmp(*argv, "-outform") == 0) {
< if (--argc < 1)
< goto bad;
< outformat = str2fmt(*(++argv));
< } else if (strcmp(*argv, "-in") == 0) {
< if (--argc < 1)
< goto bad;
< infile = *(++argv);
< } else if (strcmp(*argv, "-out") == 0) {
< if (--argc < 1)
< goto bad;
< outfile = *(++argv);
< } else if (strcmp(*argv, "-text") == 0)
---
> prog = opt_init(argc, argv, ecparam_options);
> while ((o = opt_next()) != OPT_EOF) {
> switch (o) {
> case OPT_EOF:
> case OPT_ERR:
> opthelp:
> BIO_printf(bio_err, "%s: Use -help for summary.\n", prog);
> goto end;
> case OPT_HELP:
> opt_help(ecparam_options);
> ret = 0;
> goto end;
> case OPT_INFORM:
> if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &informat))
> goto opthelp;
> break;
> case OPT_IN:
> infile = opt_arg();
> break;
> case OPT_OUTFORM:
> if (!opt_format(opt_arg(), OPT_FMT_PEMDER, &outformat))
> goto opthelp;
> break;
> case OPT_OUT:
> outfile = opt_arg();
> break;
> case OPT_TEXT:
174c134,135
< else if (strcmp(*argv, "-C") == 0)
---
> break;
> case OPT_C:
176c137,138
< else if (strcmp(*argv, "-check") == 0)
---
> break;
> case OPT_CHECK:
178,182c140,141
< else if (strcmp(*argv, "-name") == 0) {
< if (--argc < 1)
< goto bad;
< curve_name = *(++argv);
< } else if (strcmp(*argv, "-list_curves") == 0)
---
> break;
> case OPT_LIST_CURVES:
184,208c143,144
< else if (strcmp(*argv, "-conv_form") == 0) {
< if (--argc < 1)
< goto bad;
< ++argv;
< new_form = 1;
< if (strcmp(*argv, "compressed") == 0)
< form = POINT_CONVERSION_COMPRESSED;
< else if (strcmp(*argv, "uncompressed") == 0)
< form = POINT_CONVERSION_UNCOMPRESSED;
< else if (strcmp(*argv, "hybrid") == 0)
< form = POINT_CONVERSION_HYBRID;
< else
< goto bad;
< } else if (strcmp(*argv, "-param_enc") == 0) {
< if (--argc < 1)
< goto bad;
< ++argv;
< new_asn1_flag = 1;
< if (strcmp(*argv, "named_curve") == 0)
< asn1_flag = OPENSSL_EC_NAMED_CURVE;
< else if (strcmp(*argv, "explicit") == 0)
< asn1_flag = 0;
< else
< goto bad;
< } else if (strcmp(*argv, "-no_seed") == 0)
---
> break;
> case OPT_NO_SEED:
210c146,147
< else if (strcmp(*argv, "-noout") == 0)
---
> break;
> case OPT_NOOUT:
212,213c149,168
< else if (strcmp(*argv, "-genkey") == 0) {
< genkey = 1;
---
> break;
> case OPT_NAME:
> curve_name = opt_arg();
> break;
> case OPT_CONV_FORM:
> if (!opt_pair(opt_arg(), forms, &new_form))
> goto opthelp;
> form = new_form;
> new_form = 1;
> break;
> case OPT_PARAM_ENC:
> if (!opt_pair(opt_arg(), encodings, &asn1_flag))
> goto opthelp;
> new_asn1_flag = 1;
> break;
> case OPT_GENKEY:
> genkey = need_rand = 1;
> break;
> case OPT_RAND:
> inrand = opt_arg();
215,226d169
< } else if (strcmp(*argv, "-rand") == 0) {
< if (--argc < 1)
< goto bad;
< inrand = *(++argv);
< need_rand = 1;
< } else if (strcmp(*argv, "-engine") == 0) {
< if (--argc < 1)
< goto bad;
< engine = *(++argv);
< } else {
< BIO_printf(bio_err, "unknown option %s\n", *argv);
< badops = 1;
227a171,173
> case OPT_ENGINE:
> e = setup_engine(opt_arg(), 0);
> break;
229,230d174
< argc--;
< argv++;
231a176,178
> argc = opt_num_rest();
> if (argc != 0)
> goto opthelp;
233,281c180
< if (badops) {
< bad:
< BIO_printf(bio_err, "%s [options] <infile >outfile\n", prog);
< BIO_printf(bio_err, "where options are\n");
< BIO_printf(bio_err, " -inform arg input format - "
< "default PEM (DER or PEM)\n");
< BIO_printf(bio_err, " -outform arg output format - "
< "default PEM\n");
< BIO_printf(bio_err, " -in arg input file - "
< "default stdin\n");
< BIO_printf(bio_err, " -out arg output file - "
< "default stdout\n");
< BIO_printf(bio_err, " -noout do not print the "
< "ec parameter\n");
< BIO_printf(bio_err, " -text print the ec "
< "parameters in text form\n");
< BIO_printf(bio_err, " -check validate the ec "
< "parameters\n");
< BIO_printf(bio_err, " -C print a 'C' "
< "function creating the parameters\n");
< BIO_printf(bio_err, " -name arg use the "
< "ec parameters with 'short name' name\n");
< BIO_printf(bio_err, " -list_curves prints a list of "
< "all currently available curve 'short names'\n");
< BIO_printf(bio_err, " -conv_form arg specifies the "
< "point conversion form \n");
< BIO_printf(bio_err, " possible values:"
< " compressed\n");
< BIO_printf(bio_err, " "
< " uncompressed (default)\n");
< BIO_printf(bio_err, " "
< " hybrid\n");
< BIO_printf(bio_err, " -param_enc arg specifies the way"
< " the ec parameters are encoded\n");
< BIO_printf(bio_err, " in the asn1 der "
< "encoding\n");
< BIO_printf(bio_err, " possible values:"
< " named_curve (default)\n");
< BIO_printf(bio_err, " "
< " explicit\n");
< BIO_printf(bio_err, " -no_seed if 'explicit'"
< " parameters are chosen do not" " use the seed\n");
< BIO_printf(bio_err, " -genkey generate ec" " key\n");
< BIO_printf(bio_err, " -rand file files to use for"
< " random number input\n");
< BIO_printf(bio_err, " -engine e use engine e, "
< "possibly a hardware device\n");
< goto end;
< }
---
> private = genkey ? 1 : 0;
283,288c182,183
< ERR_load_crypto_strings();
<
< in = BIO_new(BIO_s_file());
< out = BIO_new(BIO_s_file());
< if ((in == NULL) || (out == NULL)) {
< ERR_print_errors(bio_err);
---
> in = bio_open_default(infile, 'r', informat);
> if (in == NULL)
290c185,187
< }
---
> out = bio_open_owner(outfile, outformat, private);
> if (out == NULL)
> goto end;
292,316d188
< if (infile == NULL)
< BIO_set_fp(in, stdin, BIO_NOCLOSE);
< else {
< if (BIO_read_filename(in, infile) <= 0) {
< perror(infile);
< goto end;
< }
< }
< if (outfile == NULL) {
< BIO_set_fp(out, stdout, BIO_NOCLOSE);
< # ifdef OPENSSL_SYS_VMS
< {
< BIO *tmpbio = BIO_new(BIO_f_linebuffer());
< out = BIO_push(tmpbio, out);
< }
< # endif
< } else {
< if (BIO_write_filename(out, outfile) <= 0) {
< perror(outfile);
< goto end;
< }
< }
<
< e = setup_engine(bio_err, engine, 0);
<
319,320c191,192
< size_t crv_len = 0;
< size_t n = 0;
---
> size_t crv_len = EC_get_builtin_curves(NULL, 0);
> size_t n;
322,328c194
< crv_len = EC_get_builtin_curves(NULL, 0);
<
< curves = OPENSSL_malloc((int)(sizeof(EC_builtin_curve) * crv_len));
<
< if (curves == NULL)
< goto end;
<
---
> curves = app_malloc((int)sizeof(*curves) * crv_len, "list curves");
361c227
< if (!strcmp(curve_name, "secp192r1")) {
---
> if (strcmp(curve_name, "secp192r1") == 0) {
365c231
< } else if (!strcmp(curve_name, "secp256r1")) {
---
> } else if (strcmp(curve_name, "secp256r1") == 0) {
387c253
< } else if (informat == FORMAT_ASN1) {
---
> } else if (informat == FORMAT_ASN1)
389c255
< } else if (informat == FORMAT_PEM) {
---
> else
391,395d256
< } else {
< BIO_printf(bio_err, "bad input format specified\n");
< goto end;
< }
<
434,438c295,301
< if ((ec_p = BN_new()) == NULL || (ec_a = BN_new()) == NULL ||
< (ec_b = BN_new()) == NULL || (ec_gen = BN_new()) == NULL ||
< (ec_order = BN_new()) == NULL ||
< (ec_cofactor = BN_new()) == NULL) {
< perror("OPENSSL_malloc");
---
> if ((ec_p = BN_new()) == NULL
> || (ec_a = BN_new()) == NULL
> || (ec_b = BN_new()) == NULL
> || (ec_gen = BN_new()) == NULL
> || (ec_order = BN_new()) == NULL
> || (ec_cofactor = BN_new()) == NULL) {
> perror("Can't allocate BN");
443,448c306,307
<
< if (is_prime) {
< if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a, ec_b, NULL))
< goto end;
< } else {
< /* TODO */
---
> if (!is_prime) {
> BIO_printf(bio_err, "Can only handle X9.62 prime fields\n");
451a311,313
> if (!EC_GROUP_get_curve_GFp(group, ec_p, ec_a, ec_b, NULL))
> goto end;
>
481c343
< buffer = (unsigned char *)OPENSSL_malloc(buf_len);
---
> buffer = app_malloc(buf_len, "BN buffer");
483,486c345,358
< if (buffer == NULL) {
< perror("OPENSSL_malloc");
< goto end;
< }
---
> BIO_printf(out, "EC_GROUP *get_ec_group_%d(void)\n{\n", len);
> print_bignum_var(out, ec_p, "ec_p", len, buffer);
> print_bignum_var(out, ec_a, "ec_a", len, buffer);
> print_bignum_var(out, ec_b, "ec_b", len, buffer);
> print_bignum_var(out, ec_gen, "ec_gen", len, buffer);
> print_bignum_var(out, ec_order, "ec_order", len, buffer);
> print_bignum_var(out, ec_cofactor, "ec_cofactor", len, buffer);
> BIO_printf(out, " int ok = 0;\n"
> " EC_GROUP *group = NULL;\n"
> " EC_POINT *point = NULL;\n"
> " BIGNUM *tmp_1 = NULL;\n"
> " BIGNUM *tmp_2 = NULL;\n"
> " BIGNUM *tmp_3 = NULL;\n"
> "\n");
488,546c360,393
< ecparam_print_var(out, ec_p, "ec_p", len, buffer);
< ecparam_print_var(out, ec_a, "ec_a", len, buffer);
< ecparam_print_var(out, ec_b, "ec_b", len, buffer);
< ecparam_print_var(out, ec_gen, "ec_gen", len, buffer);
< ecparam_print_var(out, ec_order, "ec_order", len, buffer);
< ecparam_print_var(out, ec_cofactor, "ec_cofactor", len, buffer);
<
< BIO_printf(out, "\n\n");
<
< BIO_printf(out, "EC_GROUP *get_ec_group_%d(void)\n\t{\n", len);
< BIO_printf(out, "\tint ok=0;\n");
< BIO_printf(out, "\tEC_GROUP *group = NULL;\n");
< BIO_printf(out, "\tEC_POINT *point = NULL;\n");
< BIO_printf(out, "\tBIGNUM *tmp_1 = NULL, *tmp_2 = NULL, "
< "*tmp_3 = NULL;\n\n");
< BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_p_%d, "
< "sizeof(ec_p_%d), NULL)) == NULL)\n\t\t"
< "goto err;\n", len, len);
< BIO_printf(out, "\tif ((tmp_2 = BN_bin2bn(ec_a_%d, "
< "sizeof(ec_a_%d), NULL)) == NULL)\n\t\t"
< "goto err;\n", len, len);
< BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_b_%d, "
< "sizeof(ec_b_%d), NULL)) == NULL)\n\t\t"
< "goto err;\n", len, len);
< if (is_prime) {
< BIO_printf(out, "\tif ((group = EC_GROUP_new_curve_"
< "GFp(tmp_1, tmp_2, tmp_3, NULL)) == NULL)"
< "\n\t\tgoto err;\n\n");
< } else {
< /* TODO */
< goto end;
< }
< BIO_printf(out, "\t/* build generator */\n");
< BIO_printf(out, "\tif ((tmp_1 = BN_bin2bn(ec_gen_%d, "
< "sizeof(ec_gen_%d), tmp_1)) == NULL)"
< "\n\t\tgoto err;\n", len, len);
< BIO_printf(out, "\tpoint = EC_POINT_bn2point(group, tmp_1, "
< "NULL, NULL);\n");
< BIO_printf(out, "\tif (point == NULL)\n\t\tgoto err;\n");
< BIO_printf(out, "\tif ((tmp_2 = BN_bin2bn(ec_order_%d, "
< "sizeof(ec_order_%d), tmp_2)) == NULL)"
< "\n\t\tgoto err;\n", len, len);
< BIO_printf(out, "\tif ((tmp_3 = BN_bin2bn(ec_cofactor_%d, "
< "sizeof(ec_cofactor_%d), tmp_3)) == NULL)"
< "\n\t\tgoto err;\n", len, len);
< BIO_printf(out, "\tif (!EC_GROUP_set_generator(group, point,"
< " tmp_2, tmp_3))\n\t\tgoto err;\n");
< BIO_printf(out, "\n\tok=1;\n");
< BIO_printf(out, "err:\n");
< BIO_printf(out, "\tif (tmp_1)\n\t\tBN_free(tmp_1);\n");
< BIO_printf(out, "\tif (tmp_2)\n\t\tBN_free(tmp_2);\n");
< BIO_printf(out, "\tif (tmp_3)\n\t\tBN_free(tmp_3);\n");
< BIO_printf(out, "\tif (point)\n\t\tEC_POINT_free(point);\n");
< BIO_printf(out, "\tif (!ok)\n");
< BIO_printf(out, "\t\t{\n");
< BIO_printf(out, "\t\tEC_GROUP_free(group);\n");
< BIO_printf(out, "\t\tgroup = NULL;\n");
< BIO_printf(out, "\t\t}\n");
< BIO_printf(out, "\treturn(group);\n\t}\n");
---
> BIO_printf(out, " if ((tmp_1 = BN_bin2bn(ec_p_%d, sizeof (ec_p_%d), NULL)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " if ((tmp_2 = BN_bin2bn(ec_a_%d, sizeof (ec_a_%d), NULL)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " if ((tmp_3 = BN_bin2bn(ec_b_%d, sizeof (ec_b_%d), NULL)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " if ((group = EC_GROUP_new_curve_GFp(tmp_1, tmp_2, tmp_3, NULL)) == NULL)\n"
> " goto err;\n"
> "\n");
> BIO_printf(out, " /* build generator */\n");
> BIO_printf(out, " if ((tmp_1 = BN_bin2bn(ec_gen_%d, sizeof (ec_gen_%d), tmp_1)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " point = EC_POINT_bn2point(group, tmp_1, NULL, NULL);\n");
> BIO_printf(out, " if (point == NULL)\n"
> " goto err;\n");
> BIO_printf(out, " if ((tmp_2 = BN_bin2bn(ec_order_%d, sizeof (ec_order_%d), tmp_2)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " if ((tmp_3 = BN_bin2bn(ec_cofactor_%d, sizeof (ec_cofactor_%d), tmp_3)) == NULL)\n"
> " goto err;\n", len, len);
> BIO_printf(out, " if (!EC_GROUP_set_generator(group, point, tmp_2, tmp_3))\n"
> " goto err;\n"
> "ok = 1;"
> "\n");
> BIO_printf(out, "err:\n"
> " BN_free(tmp_1);\n"
> " BN_free(tmp_2);\n"
> " BN_free(tmp_3);\n"
> " EC_POINT_free(point);\n"
> " if (!ok) {\n"
> " EC_GROUP_free(group);\n"
> " return NULL;\n"
> " }\n"
> " return (group);\n"
> "}\n");
552c399
< else if (outformat == FORMAT_PEM)
---
> else
554,558d400
< else {
< BIO_printf(bio_err, "bad output format specified for"
< " outfile\n");
< goto end;
< }
568c410
< app_RAND_load_file(NULL, bio_err, (inrand != NULL));
---
> app_RAND_load_file(NULL, (inrand != NULL));
582c424,427
< if (EC_KEY_set_group(eckey, group) == 0)
---
> if (EC_KEY_set_group(eckey, group) == 0) {
> BIO_printf(bio_err, "unable to set group when generating key\n");
> EC_KEY_free(eckey);
> ERR_print_errors(bio_err);
583a429
> }
585a432
> BIO_printf(bio_err, "unable to generate key\n");
586a434
> ERR_print_errors(bio_err);
588a437
> assert(private);
591c440
< else if (outformat == FORMAT_PEM)
---
> else
594,599d442
< else {
< BIO_printf(bio_err, "bad output format specified "
< "for outfile\n");
< EC_KEY_free(eckey);
< goto end;
< }
604c447
< app_RAND_write_file(NULL, bio_err);
---
> app_RAND_write_file(NULL);
608,623c451,458
< if (ec_p)
< BN_free(ec_p);
< if (ec_a)
< BN_free(ec_a);
< if (ec_b)
< BN_free(ec_b);
< if (ec_gen)
< BN_free(ec_gen);
< if (ec_order)
< BN_free(ec_order);
< if (ec_cofactor)
< BN_free(ec_cofactor);
< if (buffer)
< OPENSSL_free(buffer);
< if (group != NULL)
< EC_GROUP_free(group);
---
> BN_free(ec_p);
> BN_free(ec_a);
> BN_free(ec_b);
> BN_free(ec_gen);
> BN_free(ec_order);
> BN_free(ec_cofactor);
> OPENSSL_free(buffer);
> EC_GROUP_free(group);
625,630c460,462
< if (in != NULL)
< BIO_free(in);
< if (out != NULL)
< BIO_free_all(out);
< apps_shutdown();
< OPENSSL_EXIT(ret);
---
> BIO_free(in);
> BIO_free_all(out);
> return (ret);
633,660d464
< static int ecparam_print_var(BIO *out, BIGNUM *in, const char *var,
< int len, unsigned char *buffer)
< {
< BIO_printf(out, "static unsigned char %s_%d[] = {", var, len);
< if (BN_is_zero(in))
< BIO_printf(out, "\n\t0x00");
< else {
< int i, l;
<
< l = BN_bn2bin(in, buffer);
< for (i = 0; i < l - 1; i++) {
< if ((i % 12) == 0)
< BIO_printf(out, "\n\t");
< BIO_printf(out, "0x%02X,", buffer[i]);
< }
< if ((i % 12) == 0)
< BIO_printf(out, "\n\t");
< BIO_printf(out, "0x%02X", buffer[i]);
< }
< BIO_printf(out, "\n\t};\n\n");
< return 1;
< }
< #else /* !OPENSSL_NO_EC */
<
< # if PEDANTIC
< static void *dummy = &dummy;
< # endif
<