Remove NOPROTO definitions and error code comments.

[openssl.git] / crypto / rsa / rsa.h

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 26450a253656fc1e7dd8cfb368bd0ea51cd8fe04..f006b890db69f2e5eb531e0b226edbf510258ffc 100644 (file)
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -63,15 +63,14 @@
 extern "C" {
 #endif
 
 extern "C" {
 #endif
 

-#include "bn.h"
-#include "crypto.h"
+#include <openssl/bn.h>
+#include <openssl/crypto.h>

 
 typedef struct rsa_st RSA;
 
 typedef struct rsa_meth_st
        {
 
 typedef struct rsa_st RSA;
 
 typedef struct rsa_meth_st
        {

-       char *name;
-#ifndef NOPROTO
+       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,
        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,


@@ -85,16 +84,6 @@ typedef struct rsa_meth_st
                          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 */
                          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 */

-#else
-       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 */
-#endif

        int flags;                      /* RSA_METHOD_FLAG_* things */
        char *app_data;                 /* may be needed! */
        } RSA_METHOD;
        int flags;                      /* RSA_METHOD_FLAG_* things */
        char *app_data;                 /* may be needed! */
        } RSA_METHOD;


@@ -148,7 +137,6 @@ struct rsa_st
 #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)
 
 #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_new(void);
 RSA *  RSA_new_method(RSA_METHOD *method);
 int    RSA_size(RSA *);


@@ -243,66 +231,11 @@ int RSA_get_ex_new_index(long argl, char *argp, int (*new_func)(),
 int RSA_set_ex_data(RSA *r,int idx,char *arg);
 char *RSA_get_ex_data(RSA *r, int idx);
 
 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();
-int RSA_memory_lock();
-
-/* 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 */
 /* 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. */
 /* Error codes for the RSA functions. */
 
 /* Function codes. */


@@ -336,13 +269,13 @@ 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_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_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_DIGEST_TOO_BIG_FOR_RSA_KEY                112
 #define RSA_R_KEY_SIZE_TOO_SMALL                        120
 #define RSA_R_NULL_BEFORE_BLOCK_MISSING                         113
 #define RSA_R_DIGEST_TOO_BIG_FOR_RSA_KEY                112
 #define RSA_R_KEY_SIZE_TOO_SMALL                        120
 #define RSA_R_NULL_BEFORE_BLOCK_MISSING                         113


@@ -353,7 +286,7 @@ char *RSA_get_ex_data();
 #define RSA_R_UNKNOWN_ALGORITHM_TYPE                    117
 #define RSA_R_UNKNOWN_PADDING_TYPE                      118
 #define RSA_R_WRONG_SIGNATURE_LENGTH                    119
 #define RSA_R_UNKNOWN_ALGORITHM_TYPE                    117
 #define RSA_R_UNKNOWN_PADDING_TYPE                      118
 #define RSA_R_WRONG_SIGNATURE_LENGTH                    119

- 
+

 #ifdef  __cplusplus
 }
 #endif
 #ifdef  __cplusplus
 }
 #endif