Some constification and stacks that slipped through the cracks (how?).

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

diff --git a/crypto/rsa/rsa.h b/crypto/rsa/rsa.h
index 6083a6cb25b689af4ede333f1173c704299d598c..11f66b65f01a3dffaf4ac44b05d2a7e537af835e 100644 (file)
--- a/crypto/rsa/rsa.h
+++ b/crypto/rsa/rsa.h
@@ -63,15 +63,18 @@
 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
        {
        const char *name;
-#ifndef NOPROTO
        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,
@@ -81,20 +84,11 @@ typedef struct rsa_meth_st
        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, BIGNUM *p, BIGNUM *m,
-                         BN_CTX *ctx,BN_MONT_CTX *m_ctx); /* 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 */
-#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;
@@ -148,12 +142,11 @@ 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)
 
-#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);
        /* next 4 return -1 on error */
 int    RSA_public_encrypt(int flen, unsigned char *from,
                unsigned char *to, RSA *rsa,int padding);
@@ -243,68 +236,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);
 
-#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_PKCS1_OAEP();
-int RSA_padding_check_PKCS1_OAEP();
-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. */
@@ -355,7 +291,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
- 
+
 #ifdef  __cplusplus
 }
 #endif