[openssl-commits] [openssl] OpenSSL_1_1_1-stable update

[Paul I. Dale]

The branch OpenSSL_1_1_1-stable has been updated
       via  24907560dbe9df480863a664adcd2c4b1cdcd5e9 (commit)
      from  4978ecb26e6cda98cff002d7ecece1a2bc147499 (commit)


- Log -----------------------------------------------------------------
commit 24907560dbe9df480863a664adcd2c4b1cdcd5e9
Author: Pauli <paul.dale at oracle.com>
Date:   Mon Sep 17 07:47:42 2018 +1000

    Use 'i' as parameter name not 'I'.
    
    The latter causes problems when complex.h is #included.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/7233)
    
    (cherry picked from commit 972f67889b5a10c33dbc3d500cfa65b544e68b46)

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

Summary of changes:
 crypto/rsa/rsa_meth.c     | 4 ++--
 doc/man3/RSA_meth_new.pod | 4 ++--
 include/openssl/rsa.h     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto/rsa/rsa_meth.c b/crypto/rsa/rsa_meth.c
index f5880a7..def19f3 100644
--- a/crypto/rsa/rsa_meth.c
+++ b/crypto/rsa/rsa_meth.c
@@ -163,13 +163,13 @@ int RSA_meth_set_priv_dec(RSA_METHOD *meth,
 
     /* Can be null */
 int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))
-    (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
+    (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx)
 {
     return meth->rsa_mod_exp;
 }
 
 int RSA_meth_set_mod_exp(RSA_METHOD *meth,
-                         int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa,
+                         int (*mod_exp) (BIGNUM *r0, const BIGNUM *i, RSA *rsa,
                                          BN_CTX *ctx))
 {
     meth->rsa_mod_exp = mod_exp;
diff --git a/doc/man3/RSA_meth_new.pod b/doc/man3/RSA_meth_new.pod
index 69ba9df..f210951 100644
--- a/doc/man3/RSA_meth_new.pod
+++ b/doc/man3/RSA_meth_new.pod
@@ -64,10 +64,10 @@ RSA_meth_get_multi_prime_keygen, RSA_meth_set_multi_prime_keygen
                                            unsigned char *to, RSA *rsa, int padding));
 
  /* Can be null */
- int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))(BIGNUM *r0, const BIGNUM *I,
+ int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))(BIGNUM *r0, const BIGNUM *i,
                                                      RSA *rsa, BN_CTX *ctx);
  int RSA_meth_set_mod_exp(RSA_METHOD *rsa,
-                          int (*mod_exp)(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
+                          int (*mod_exp)(BIGNUM *r0, const BIGNUM *i, RSA *rsa,
                                          BN_CTX *ctx));
 
  /* Can be null */
diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index a611b6a..a38ba12 100644
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -456,9 +456,9 @@ int RSA_meth_set_priv_dec(RSA_METHOD *rsa,
                                            unsigned char *to, RSA *rsa,
                                            int padding));
 int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))
-    (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);
+    (BIGNUM *r0, const BIGNUM *i, RSA *rsa, BN_CTX *ctx);
 int RSA_meth_set_mod_exp(RSA_METHOD *rsa,
-                         int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa,
+                         int (*mod_exp) (BIGNUM *r0, const BIGNUM *i, RSA *rsa,
                                          BN_CTX *ctx));
 int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth))
     (BIGNUM *r, const BIGNUM *a, const BIGNUM *p,