[openssl-commits] [openssl] master update

[kaduk at mit.edu]

The branch master has been updated
       via  64bf10167b914bac04a19f9afee381d75fcd670a (commit)
      from  b35ef02628b48d7041cdb8961e931dbe5e10d169 (commit)


- Log -----------------------------------------------------------------
commit 64bf10167b914bac04a19f9afee381d75fcd670a
Author: Johannes Bauer <joe at johannes-bauer.com>
Date:   Tue Aug 15 18:52:24 2017 +0200

    Fix coding style of EVP_PKEY_CTX_ctrl_uint64
    
    Code review of @dot-asm pointed out style guide violation; this patch
    fixes it.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Ben Kaduk <kaduk at mit.edu>
    (Merged from https://github.com/openssl/openssl/pull/4166)

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

Summary of changes:
 crypto/evp/pmeth_lib.c | 2 +-
 include/openssl/evp.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 322fdb4..71ec099 100644
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -360,7 +360,7 @@ int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
 }
 
 int EVP_PKEY_CTX_ctrl_uint64(EVP_PKEY_CTX *ctx, int keytype, int optype,
-                                int cmd, uint64_t value)
+                             int cmd, uint64_t value)
 {
     return EVP_PKEY_CTX_ctrl(ctx, keytype, optype, cmd, 0, &value);
 }
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index e472ea2..69ffc20 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -1283,7 +1283,7 @@ int EVP_PKEY_CTX_ctrl(EVP_PKEY_CTX *ctx, int keytype, int optype,
 int EVP_PKEY_CTX_ctrl_str(EVP_PKEY_CTX *ctx, const char *type,
                           const char *value);
 int EVP_PKEY_CTX_ctrl_uint64(EVP_PKEY_CTX *ctx, int keytype, int optype,
-                                int cmd, uint64_t value);
+                             int cmd, uint64_t value);
 
 int EVP_PKEY_CTX_str2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *str);
 int EVP_PKEY_CTX_hex2ctrl(EVP_PKEY_CTX *ctx, int cmd, const char *hex);