[openssl-commits] [openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  3f5abab94104574c32991243668ac633a8d8e525 (commit)
      from  12bd4e141eac30543a790156154deca195ace1b7 (commit)


- Log -----------------------------------------------------------------
commit 3f5abab94104574c32991243668ac633a8d8e525
Author: Nicola Tuveri <nic.tuv at gmail.com>
Date:   Fri Jun 22 00:59:58 2018 +0300

    enable-ec_nistp_64_gcc_128: Fix function prototype warning [-Wstrict-prototypes]
    
    Fix prototype warnings triggered by -Wstrict-prototypes when configuring
    with `enable-ec_nistp_64_gcc_128`
    
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/6556)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/ecp_nistp224.c | 2 +-
 crypto/ec/ecp_nistp256.c | 2 +-
 crypto/ec/ecp_nistp521.c | 2 +-
 engines/e_padlock.c      | 4 ++--
 test/ectest.c            | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto/ec/ecp_nistp224.c b/crypto/ec/ecp_nistp224.c
index 6e7c687..6155b54 100644
--- a/crypto/ec/ecp_nistp224.c
+++ b/crypto/ec/ecp_nistp224.c
@@ -1212,7 +1212,7 @@ static void batch_mul(felem x_out, felem y_out, felem z_out,
  * FUNCTIONS TO MANAGE PRECOMPUTATION
  */
 
-static NISTP224_PRE_COMP *nistp224_pre_comp_new()
+static NISTP224_PRE_COMP *nistp224_pre_comp_new(void)
 {
     NISTP224_PRE_COMP *ret = OPENSSL_zalloc(sizeof(*ret));
 
diff --git a/crypto/ec/ecp_nistp256.c b/crypto/ec/ecp_nistp256.c
index 19caa03..00fcfd5 100644
--- a/crypto/ec/ecp_nistp256.c
+++ b/crypto/ec/ecp_nistp256.c
@@ -1832,7 +1832,7 @@ const EC_METHOD *EC_GFp_nistp256_method(void)
  * FUNCTIONS TO MANAGE PRECOMPUTATION
  */
 
-static NISTP256_PRE_COMP *nistp256_pre_comp_new()
+static NISTP256_PRE_COMP *nistp256_pre_comp_new(void)
 {
     NISTP256_PRE_COMP *ret = OPENSSL_zalloc(sizeof(*ret));
 
diff --git a/crypto/ec/ecp_nistp521.c b/crypto/ec/ecp_nistp521.c
index 43f3e2d..4e6c0f9 100644
--- a/crypto/ec/ecp_nistp521.c
+++ b/crypto/ec/ecp_nistp521.c
@@ -1671,7 +1671,7 @@ const EC_METHOD *EC_GFp_nistp521_method(void)
  * FUNCTIONS TO MANAGE PRECOMPUTATION
  */
 
-static NISTP521_PRE_COMP *nistp521_pre_comp_new()
+static NISTP521_PRE_COMP *nistp521_pre_comp_new(void)
 {
     NISTP521_PRE_COMP *ret = OPENSSL_zalloc(sizeof(*ret));
 
diff --git a/engines/e_padlock.c b/engines/e_padlock.c
index b86f165..43944ab 100644
--- a/engines/e_padlock.c
+++ b/engines/e_padlock.c
@@ -199,10 +199,10 @@ struct padlock_cipher_data {
 };
 
 /* Interface to assembler module */
-unsigned int padlock_capability();
+unsigned int padlock_capability(void);
 void padlock_key_bswap(AES_KEY *key);
 void padlock_verify_context(struct padlock_cipher_data *ctx);
-void padlock_reload_key();
+void padlock_reload_key(void);
 void padlock_aes_block(void *out, const void *inp,
                        struct padlock_cipher_data *ctx);
 int padlock_ecb_encrypt(void *out, const void *inp,
diff --git a/test/ectest.c b/test/ectest.c
index 73e8aa8..ead23d7 100644
--- a/test/ectest.c
+++ b/test/ectest.c
@@ -1167,7 +1167,7 @@ static int internal_curve_test_method(int n)
  * implementations of several NIST curves with characteristic > 3.
  */
 struct nistp_test_params {
-    const EC_METHOD *(*meth) ();
+    const EC_METHOD *(*meth) (void);
     int degree;
     /*
      * Qx, Qy and D are taken from