Change functions to ANSI C.

[oweals/openssl.git] / crypto / rsa / rsa_lib.c

diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index 5ce51f9f56b5c4a3fa3d00cce7bc60d12b5e950b..6732e9832f6737fdad203549cda8261dedf01ebd 100644 (file)
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -63,25 +63,23 @@
 #include "bn.h"
 #include "rsa.h"
 
-char *RSA_version="RSA part of SSLeay 0.9.1a 06-Jul-1998";
+const char *RSA_version="RSA" OPENSSL_VERSION_PTEXT;
 
 static RSA_METHOD *default_RSA_meth=NULL;
 static int rsa_meth_num=0;
 static STACK *rsa_meth=NULL;
 
-RSA *RSA_new()
+RSA *RSA_new(void)
        {
        return(RSA_new_method(NULL));
        }
 
-void RSA_set_default_method(meth)
-RSA_METHOD *meth;
+void RSA_set_default_method(RSA_METHOD *meth)
        {
        default_RSA_meth=meth;
        }
 
-RSA *RSA_new_method(meth)
-RSA_METHOD *meth;
+RSA *RSA_new_method(RSA_METHOD *meth)
        {
        RSA *ret;
 
@@ -116,9 +114,9 @@ RSA_METHOD *meth;
        ret->dmq1=NULL;
        ret->iqmp=NULL;
        ret->references=1;
-       ret->method_mod_n=NULL;
-       ret->method_mod_p=NULL;
-       ret->method_mod_q=NULL;
+       ret->_method_mod_n=NULL;
+       ret->_method_mod_p=NULL;
+       ret->_method_mod_q=NULL;
        ret->blinding=NULL;
        ret->bignum_data=NULL;
        ret->flags=ret->meth->flags;
@@ -132,8 +130,7 @@ RSA_METHOD *meth;
        return(ret);
        }
 
-void RSA_free(r)
-RSA *r;
+void RSA_free(RSA *r)
        {
        int i;
 
@@ -170,87 +167,59 @@ RSA *r;
        Free(r);
        }
 
-int RSA_get_ex_new_index(argl,argp,new_func,dup_func,free_func)
-long argl;
-char *argp;
-int (*new_func)();
-int (*dup_func)();
-void (*free_func)();
+int RSA_get_ex_new_index(long argl, char *argp, int (*new_func)(),
+            int (*dup_func)(), void (*free_func)())
         {
        rsa_meth_num++;
        return(CRYPTO_get_ex_new_index(rsa_meth_num-1,
                &rsa_meth,argl,argp,new_func,dup_func,free_func));
         }
 
-int RSA_set_ex_data(r,idx,arg)
-RSA *r;
-int idx;
-char *arg;
+int RSA_set_ex_data(RSA *r, int idx, char *arg)
        {
        return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
        }
 
-char *RSA_get_ex_data(r,idx)
-RSA *r;
-int idx;
+char *RSA_get_ex_data(RSA *r, int idx)
        {
        return(CRYPTO_get_ex_data(&r->ex_data,idx));
        }
 
-int RSA_size(r)
-RSA *r;
+int RSA_size(RSA *r)
        {
        return(BN_num_bytes(r->n));
        }
 
-int RSA_public_encrypt(flen, from, to, rsa, padding)
-int flen;
-unsigned char *from;
-unsigned char *to;
-RSA *rsa;
-int padding;
+int RSA_public_encrypt(int flen, unsigned char *from, unsigned char *to,
+            RSA *rsa, int padding)
        {
        return(rsa->meth->rsa_pub_enc(flen, from, to, rsa, padding));
        }
 
-int RSA_private_encrypt(flen, from, to, rsa, padding)
-int flen;
-unsigned char *from;
-unsigned char *to;
-RSA *rsa;
-int padding;
+int RSA_private_encrypt(int flen, unsigned char *from, unsigned char *to,
+            RSA *rsa, int padding)
        {
        return(rsa->meth->rsa_priv_enc(flen, from, to, rsa, padding));
        }
 
-int RSA_private_decrypt(flen, from, to, rsa, padding)
-int flen;
-unsigned char *from;
-unsigned char *to;
-RSA *rsa;
-int padding;
+int RSA_private_decrypt(int flen, unsigned char *from, unsigned char *to,
+            RSA *rsa, int padding)
        {
        return(rsa->meth->rsa_priv_dec(flen, from, to, rsa, padding));
        }
 
-int RSA_public_decrypt(flen, from, to, rsa, padding)
-int flen;
-unsigned char *from;
-unsigned char *to;
-RSA *rsa;
-int padding;
+int RSA_public_decrypt(int flen, unsigned char *from, unsigned char *to,
+            RSA *rsa, int padding)
        {
        return(rsa->meth->rsa_pub_dec(flen, from, to, rsa, padding));
        }
 
-int RSA_flags(r)
-RSA *r;
+int RSA_flags(RSA *r)
        {
        return((r == NULL)?0:r->meth->flags);
        }
 
-void RSA_blinding_off(rsa)
-RSA *rsa;
+void RSA_blinding_off(RSA *rsa)
        {
        if (rsa->blinding != NULL)
                {
@@ -260,9 +229,7 @@ RSA *rsa;
        rsa->flags&= ~RSA_FLAG_BLINDING;
        }
 
-int RSA_blinding_on(rsa,p_ctx)
-RSA *rsa;
-BN_CTX *p_ctx;
+int RSA_blinding_on(RSA *rsa, BN_CTX *p_ctx)
        {
        BIGNUM *A,*Ai;
        BN_CTX *ctx;
@@ -283,8 +250,8 @@ BN_CTX *p_ctx;
        if (!BN_rand(A,BN_num_bits(rsa->n)-1,1,0)) goto err;
        if ((Ai=BN_mod_inverse(NULL,A,rsa->n,ctx)) == NULL) goto err;
 
-       if (!rsa->meth->bn_mod_exp(A,A,rsa->e,rsa->n,ctx,
-               (char *)rsa->method_mod_n)) goto err;
+       if (!rsa->meth->bn_mod_exp(A,A,rsa->e,rsa->n,ctx,rsa->_method_mod_n))
+           goto err;
        rsa->blinding=BN_BLINDING_new(A,Ai,rsa->n);
        ctx->tos--;
        rsa->flags|=RSA_FLAG_BLINDING;
@@ -295,8 +262,7 @@ err:
        return(ret);
        }
 
-int RSA_memory_lock(r)
-RSA *r;
+int RSA_memory_lock(RSA *r)
        {
        int i,j,k,off;
        char *p;