OpenSSL 0.9.4 merge

1 files changed, 98 insertions, 105 deletions

diff --git a/src/lib/libcrypto/rsa/rsa.h b/src/lib/libcrypto/rsa/rsa.h
index aeb78ffcd3..9230b2fcc9 100644
--- a/src/lib/libcrypto/rsa/rsa.h
+++ b/src/lib/libcrypto/rsa/rsa.h
@@ -63,26 +63,37 @@
 extern "C" {
 #endif
 
-#include "bn.h"
-#include "crypto.h"
+#include <openssl/bn.h>
+#include <openssl/crypto.h>
+
+#ifdef NO_RSA
+#error RSA is disabled.
+#endif
+
+typedef struct rsa_st RSA;
 
 typedef struct rsa_meth_st
         {
-        char *name;
-        int (*rsa_pub_enc)();
-        int (*rsa_pub_dec)();
-        int (*rsa_priv_enc)();
-        int (*rsa_priv_dec)();
-        int (*rsa_mod_exp)();           /* Can be null */
-        int (*bn_mod_exp)();            /* Can be null */
-        int (*init)(/* RSA * */);       /* called at new */
-        int (*finish)(/* RSA * */);     /* called at free */
-
+        const char *name;
+        int (*rsa_pub_enc)(int flen,unsigned char *from,unsigned char *to,
+                           RSA *rsa,int padding);
+        int (*rsa_pub_dec)(int flen,unsigned char *from,unsigned char *to,
+                           RSA *rsa,int padding);
+        int (*rsa_priv_enc)(int flen,unsigned char *from,unsigned char *to,
+                            RSA *rsa,int padding);
+        int (*rsa_priv_dec)(int flen,unsigned char *from,unsigned char *to,
+                            RSA *rsa,int padding);
+        int (*rsa_mod_exp)(BIGNUM *r0,BIGNUM *I,RSA *rsa); /* Can be null */
+        int (*bn_mod_exp)(BIGNUM *r, BIGNUM *a, const BIGNUM *p,
+                          const BIGNUM *m, BN_CTX *ctx,
+                          BN_MONT_CTX *m_ctx); /* Can be null */
+        int (*init)(RSA *rsa);          /* called at new */
+        int (*finish)(RSA *rsa);        /* called at free */
         int flags;                      /* RSA_METHOD_FLAG_* things */
         char *app_data;                 /* may be needed! */
         } RSA_METHOD;
 
-typedef struct rsa_st
+struct rsa_st
         {
         /* The first parameter is used to pickup errors where
          * this is passed instead of aEVP_PKEY, it is set to 0 */
@@ -97,41 +108,52 @@ typedef struct rsa_st
         BIGNUM *dmp1;
         BIGNUM *dmq1;
         BIGNUM *iqmp;
-        /* be carefull using this if the RSA structure is shared */
+        /* be careful using this if the RSA structure is shared */
         CRYPTO_EX_DATA ex_data;
         int references;
         int flags;
 
-        /* Normally used to cached montgomery values */
-        char *method_mod_n;
-        char *method_mod_p;
-        char *method_mod_q;
+        /* Used to cache montgomery values */
+        BN_MONT_CTX *_method_mod_n;
+        BN_MONT_CTX *_method_mod_p;
+        BN_MONT_CTX *_method_mod_q;
 
+        /* all BIGNUM values are actually in the following data, if it is not
+         * NULL */
+        char *bignum_data;
         BN_BLINDING *blinding;
-        } RSA;
+        };
 
 #define RSA_3   0x3L
 #define RSA_F4  0x10001L
 
 #define RSA_METHOD_FLAG_NO_CHECK        0x01 /* don't check pub/private match */
+
 #define RSA_FLAG_CACHE_PUBLIC           0x02
 #define RSA_FLAG_CACHE_PRIVATE          0x04
 #define RSA_FLAG_BLINDING               0x08
 #define RSA_FLAG_THREAD_SAFE            0x10
+/* This flag means the private key operations will be handled by rsa_mod_exp
+ * and that they do not depend on the private key components being present:
+ * for example a key stored in external hardware. Without this flag bn_mod_exp
+ * gets called when private key components are absent.
+ */
+#define RSA_FLAG_EXT_PKEY               0x20
 
 #define RSA_PKCS1_PADDING       1
 #define RSA_SSLV23_PADDING      2
 #define RSA_NO_PADDING          3
+#define RSA_PKCS1_OAEP_PADDING  4
 
 #define RSA_set_app_data(s,arg)         RSA_set_ex_data(s,0,(char *)arg)
 #define RSA_get_app_data(s)             RSA_get_ex_data(s,0)
 
-#ifndef NOPROTO
 RSA *   RSA_new(void);
 RSA *   RSA_new_method(RSA_METHOD *method);
 int     RSA_size(RSA *);
 RSA *   RSA_generate_key(int bits, unsigned long e,void
-                (*callback)(int,int,char *),char *cb_arg);
+                (*callback)(int,int,void *),void *cb_arg);
+int     RSA_check_key(RSA *);
         /* next 4 return -1 on error */
 int     RSA_public_encrypt(int flen, unsigned char *from,
                 unsigned char *to, RSA *rsa,int padding);
@@ -146,6 +168,12 @@ void	RSA_free (RSA *r);
 int     RSA_flags(RSA *r);
 
 void RSA_set_default_method(RSA_METHOD *meth);
+RSA_METHOD *RSA_get_default_method(void);
+RSA_METHOD *RSA_get_method(RSA *rsa);
+RSA_METHOD *RSA_set_method(RSA *rsa, RSA_METHOD *meth);
+
+/* This function needs the memory locking malloc callbacks to be installed */
+int RSA_memory_lock(RSA *r);
 
 /* If you have RSAref compiled in. */
 RSA_METHOD *RSA_PKCS1_RSAref(void);
@@ -193,107 +221,63 @@ void RSA_blinding_off(RSA *rsa);
 int RSA_padding_add_PKCS1_type_1(unsigned char *to,int tlen,
         unsigned char *f,int fl);
 int RSA_padding_check_PKCS1_type_1(unsigned char *to,int tlen,
-        unsigned char *f,int fl);
+        unsigned char *f,int fl,int rsa_len);
 int RSA_padding_add_PKCS1_type_2(unsigned char *to,int tlen,
         unsigned char *f,int fl);
 int RSA_padding_check_PKCS1_type_2(unsigned char *to,int tlen,
-        unsigned char *f,int fl);
+        unsigned char *f,int fl,int rsa_len);
+int RSA_padding_add_PKCS1_OAEP(unsigned char *to,int tlen,
+                               unsigned char *f,int fl,unsigned char *p,
+                               int pl);
+int RSA_padding_check_PKCS1_OAEP(unsigned char *to,int tlen,
+                                 unsigned char *f,int fl,int rsa_len,
+                                 unsigned char *p,int pl);
 int RSA_padding_add_SSLv23(unsigned char *to,int tlen,
         unsigned char *f,int fl);
 int RSA_padding_check_SSLv23(unsigned char *to,int tlen,
-        unsigned char *f,int fl);
+        unsigned char *f,int fl,int rsa_len);
 int RSA_padding_add_none(unsigned char *to,int tlen,
         unsigned char *f,int fl);
 int RSA_padding_check_none(unsigned char *to,int tlen,
-        unsigned char *f,int fl);
+        unsigned char *f,int fl,int rsa_len);
 
 int RSA_get_ex_new_index(long argl, char *argp, int (*new_func)(),
         int (*dup_func)(), void (*free_func)());
 int RSA_set_ex_data(RSA *r,int idx,char *arg);
 char *RSA_get_ex_data(RSA *r, int idx);
 
-#else
-
-RSA *   RSA_new();
-RSA *   RSA_new_method();
-int     RSA_size();
-RSA *   RSA_generate_key();
-int     RSA_public_encrypt();
-int     RSA_private_encrypt();
-int     RSA_public_decrypt();
-int     RSA_private_decrypt();
-void    RSA_free ();
-
-int     RSA_flags();
-
-void RSA_set_default_method();
-
-/* RSA_METHOD *RSA_PKCS1_RSAref(); */
-RSA_METHOD *RSA_PKCS1_SSLeay();
-
-void    ERR_load_RSA_strings();
-
-RSA *   d2i_RSAPublicKey();
-int     i2d_RSAPublicKey();
-RSA *   d2i_RSAPrivateKey();
-int     i2d_RSAPrivateKey();
-#ifndef NO_FP_API
-int     RSA_print_fp();
-#endif
-
-int     RSA_print();
-
-int i2d_Netscape_RSA();
-RSA *d2i_Netscape_RSA();
-RSA *d2i_Netscape_RSA_2();
-
-int RSA_sign();
-int RSA_verify();
-
-int RSA_sign_ASN1_OCTET_STRING();
-int RSA_verify_ASN1_OCTET_STRING();
-int RSA_blinding_on();
-void RSA_blinding_off();
-
-int RSA_padding_add_PKCS1_type_1();
-int RSA_padding_check_PKCS1_type_1();
-int RSA_padding_add_PKCS1_type_2();
-int RSA_padding_check_PKCS1_type_2();
-int RSA_padding_add_SSLv23();
-int RSA_padding_check_SSLv23();
-int RSA_padding_add_none();
-int RSA_padding_check_none();
-
-int RSA_get_ex_new_index();
-int RSA_set_ex_data();
-char *RSA_get_ex_data();
-
-#endif
-
 /* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
 /* Error codes for the RSA functions. */
 
 /* Function codes. */
-#define RSA_F_RSA_EAY_PRIVATE_DECRYPT                    100
-#define RSA_F_RSA_EAY_PRIVATE_ENCRYPT                    101
-#define RSA_F_RSA_EAY_PUBLIC_DECRYPT                     102
-#define RSA_F_RSA_EAY_PUBLIC_ENCRYPT                     103
-#define RSA_F_RSA_GENERATE_KEY                           104
-#define RSA_F_RSA_NEW_METHOD                             105
-#define RSA_F_RSA_PADDING_ADD_NONE                       106
-#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1               107
-#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2               108
-#define RSA_F_RSA_PADDING_ADD_SSLV23                     109
-#define RSA_F_RSA_PADDING_CHECK_NONE                     110
-#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1             111
-#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2             112
-#define RSA_F_RSA_PADDING_CHECK_SSLV23                   113
-#define RSA_F_RSA_PRINT                                  114
-#define RSA_F_RSA_PRINT_FP                               115
-#define RSA_F_RSA_SIGN                                   116
-#define RSA_F_RSA_SIGN_ASN1_OCTET_STRING                 117
-#define RSA_F_RSA_VERIFY                                 118
-#define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING               119
+#define RSA_F_MEMORY_LOCK                                100
+#define RSA_F_RSA_CHECK_KEY                              123
+#define RSA_F_RSA_EAY_PRIVATE_DECRYPT                    101
+#define RSA_F_RSA_EAY_PRIVATE_ENCRYPT                    102
+#define RSA_F_RSA_EAY_PUBLIC_DECRYPT                     103
+#define RSA_F_RSA_EAY_PUBLIC_ENCRYPT                     104
+#define RSA_F_RSA_GENERATE_KEY                           105
+#define RSA_F_RSA_NEW_METHOD                             106
+#define RSA_F_RSA_PADDING_ADD_NONE                       107
+#define RSA_F_RSA_PADDING_ADD_PKCS1_OAEP                 121
+#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_1               108
+#define RSA_F_RSA_PADDING_ADD_PKCS1_TYPE_2               109
+#define RSA_F_RSA_PADDING_ADD_SSLV23                     110
+#define RSA_F_RSA_PADDING_CHECK_NONE                     111
+#define RSA_F_RSA_PADDING_CHECK_PKCS1_OAEP               122
+#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_1             112
+#define RSA_F_RSA_PADDING_CHECK_PKCS1_TYPE_2             113
+#define RSA_F_RSA_PADDING_CHECK_SSLV23                   114
+#define RSA_F_RSA_PRINT                                  115
+#define RSA_F_RSA_PRINT_FP                               116
+#define RSA_F_RSA_SIGN                                   117
+#define RSA_F_RSA_SIGN_ASN1_OCTET_STRING                 118
+#define RSA_F_RSA_VERIFY                                 119
+#define RSA_F_RSA_VERIFY_ASN1_OCTET_STRING               120
 
 /* Reason codes. */
 #define RSA_R_ALGORITHM_MISMATCH                         100
@@ -301,22 +285,31 @@ char *RSA_get_ex_data();
 #define RSA_R_BAD_FIXED_HEADER_DECRYPT                   102
 #define RSA_R_BAD_PAD_BYTE_COUNT                         103
 #define RSA_R_BAD_SIGNATURE                              104
-#define RSA_R_BAD_ZERO_BYTE                              105
 #define RSA_R_BLOCK_TYPE_IS_NOT_01                       106
 #define RSA_R_BLOCK_TYPE_IS_NOT_02                       107
 #define RSA_R_DATA_GREATER_THAN_MOD_LEN                  108
 #define RSA_R_DATA_TOO_LARGE                             109
 #define RSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE                110
 #define RSA_R_DATA_TOO_SMALL                             111
+#define RSA_R_DATA_TOO_SMALL_FOR_KEY_SIZE                122
+#define RSA_R_D_E_NOT_CONGRUENT_TO_1                     123
 #define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY                 112
+#define RSA_R_DMP1_NOT_CONGRUENT_TO_D                    124
+#define RSA_R_DMQ1_NOT_CONGRUENT_TO_D                    125
+#define RSA_R_IQMP_NOT_INVERSE_OF_Q                      126
+#define RSA_R_KEY_SIZE_TOO_SMALL                         120
 #define RSA_R_NULL_BEFORE_BLOCK_MISSING                  113
+#define RSA_R_N_DOES_NOT_EQUAL_P_Q                       127
+#define RSA_R_OAEP_DECODING_ERROR                        121
 #define RSA_R_PADDING_CHECK_FAILED                       114
+#define RSA_R_P_NOT_PRIME                                128
+#define RSA_R_Q_NOT_PRIME                                129
 #define RSA_R_SSLV3_ROLLBACK_ATTACK                      115
 #define RSA_R_THE_ASN1_OBJECT_IDENTIFIER_IS_NOT_KNOWN_FOR_THIS_MD 116
 #define RSA_R_UNKNOWN_ALGORITHM_TYPE                     117
 #define RSA_R_UNKNOWN_PADDING_TYPE                       118
 #define RSA_R_WRONG_SIGNATURE_LENGTH                     119
- 
+
 #ifdef  __cplusplus
 }
 #endif