crypto/bn: fix return value in BN_generate_prime

[openssl.git] / apps / ec.c

diff --git a/apps/ec.c b/apps/ec.c
index 007bf0a89c95a52f8ca5d4df6ea8150660dac5e1..03abb00683373b8ea0565af9412d1ed332508e40 100644 (file)
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2002-2018 The OpenSSL Project Authors. All Rights Reserved.

  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy


@@ -16,6 +16,7 @@ NON_EMPTY_TRANSLATION_UNIT
 # include <stdlib.h>
 # include <string.h>
 # include "apps.h"
 # include <stdlib.h>
 # include <string.h>
 # include "apps.h"

+# include "progs.h"

 # include <openssl/bio.h>
 # include <openssl/err.h>
 # include <openssl/evp.h>
 # include <openssl/bio.h>
 # include <openssl/err.h>
 # include <openssl/evp.h>


@@ -42,7 +43,7 @@ typedef enum OPTION_choice {
     OPT_NO_PUBLIC, OPT_CHECK
 } OPTION_CHOICE;
 
     OPT_NO_PUBLIC, OPT_CHECK
 } OPTION_CHOICE;
 

-OPTIONS ec_options[] = {
+const OPTIONS ec_options[] = {

     {"help", OPT_HELP, '-', "Display this summary"},
     {"in", OPT_IN, 's', "Input file"},
     {"inform", OPT_INFORM, 'f', "Input format - DER or PEM"},
     {"help", OPT_HELP, '-', "Display this summary"},
     {"in", OPT_IN, 's', "Input file"},
     {"inform", OPT_INFORM, 'f', "Input format - DER or PEM"},


@@ -185,7 +186,7 @@ int ec_main(int argc, char **argv)
     } else if (informat == FORMAT_ENGINE) {
         EVP_PKEY *pkey;
         if (pubin)
     } else if (informat == FORMAT_ENGINE) {
         EVP_PKEY *pkey;
         if (pubin)

-            pkey = load_pubkey(infile, informat , 1, passin, e, "Public Key");
+            pkey = load_pubkey(infile, informat, 1, passin, e, "Public Key");

         else
             pkey = load_key(infile, informat, 1, passin, e, "Private Key");
         if (pkey != NULL) {
         else
             pkey = load_key(infile, informat, 1, passin, e, "Private Key");
         if (pkey != NULL) {


@@ -244,20 +245,20 @@ int ec_main(int argc, char **argv)
 
     BIO_printf(bio_err, "writing EC key\n");
     if (outformat == FORMAT_ASN1) {
 
     BIO_printf(bio_err, "writing EC key\n");
     if (outformat == FORMAT_ASN1) {

-        if (param_out)
+        if (param_out) {

             i = i2d_ECPKParameters_bio(out, group);
             i = i2d_ECPKParameters_bio(out, group);

-        else if (pubin || pubout)
+        } else if (pubin || pubout) {

             i = i2d_EC_PUBKEY_bio(out, eckey);
             i = i2d_EC_PUBKEY_bio(out, eckey);

-        else {
+        } else {

             assert(private);
             i = i2d_ECPrivateKey_bio(out, eckey);
         }
     } else {
             assert(private);
             i = i2d_ECPrivateKey_bio(out, eckey);
         }
     } else {

-        if (param_out)
+        if (param_out) {

             i = PEM_write_bio_ECPKParameters(out, group);
             i = PEM_write_bio_ECPKParameters(out, group);

-        else if (pubin || pubout)
+        } else if (pubin || pubout) {

             i = PEM_write_bio_EC_PUBKEY(out, eckey);
             i = PEM_write_bio_EC_PUBKEY(out, eckey);

-        else {
+        } else {

             assert(private);
             i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
                                            NULL, 0, NULL, passout);
             assert(private);
             i = PEM_write_bio_ECPrivateKey(out, eckey, enc,
                                            NULL, 0, NULL, passout);


@@ -267,14 +268,16 @@ int ec_main(int argc, char **argv)
     if (!i) {
         BIO_printf(bio_err, "unable to write private key\n");
         ERR_print_errors(bio_err);
     if (!i) {
         BIO_printf(bio_err, "unable to write private key\n");
         ERR_print_errors(bio_err);

-    } else
+    } else {

         ret = 0;
         ret = 0;

+    }

  end:
     BIO_free(in);
     BIO_free_all(out);
     EC_KEY_free(eckey);
  end:
     BIO_free(in);
     BIO_free_all(out);
     EC_KEY_free(eckey);

+    release_engine(e);

     OPENSSL_free(passin);
     OPENSSL_free(passout);
     OPENSSL_free(passin);
     OPENSSL_free(passout);

-    return (ret);
+    return ret;

 }
 #endif
 }
 #endif