[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  79b4c806a1680b631937c5cfc74a65e7b0ad97f4 (commit)
      from  076fc55527a1499391fa6de109c8387895199ee9 (commit)


- Log -----------------------------------------------------------------
commit 79b4c806a1680b631937c5cfc74a65e7b0ad97f4
Author: Rich Salz <rsalz at openssl.org>
Date:   Fri Apr 7 13:27:53 2017 -0400

    Make default_method mostly compile-time (cont'd)
    
    Forgot to include this commit as requested by review.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2244)

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

Summary of changes:
 include/openssl/rsa.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index f94ec5f..024a240 100644
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -501,11 +501,11 @@ int ERR_load_RSA_strings(void);
 # define RSA_F_RSA_METH_SET1_NAME                         163
 # define RSA_F_RSA_MGF1_TO_MD                             157
 # define RSA_F_RSA_NEW_METHOD                             106
-# define RSA_F_RSA_NULL                                   0
-# define RSA_F_RSA_NULL_PRIVATE_DECRYPT                   0
-# define RSA_F_RSA_NULL_PRIVATE_ENCRYPT                   0
-# define RSA_F_RSA_NULL_PUBLIC_DECRYPT                    0
-# define RSA_F_RSA_NULL_PUBLIC_ENCRYPT                    0
+# define RSA_F_RSA_NULL                                   124
+# define RSA_F_RSA_NULL_PRIVATE_DECRYPT                   132
+# define RSA_F_RSA_NULL_PRIVATE_ENCRYPT                   133
+# define RSA_F_RSA_NULL_PUBLIC_DECRYPT                    134
+# define RSA_F_RSA_NULL_PUBLIC_ENCRYPT                    135
 # define RSA_F_RSA_OSSL_PRIVATE_DECRYPT                   101
 # define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT                   102
 # define RSA_F_RSA_OSSL_PUBLIC_DECRYPT                    103