Let "make test" survive without DEVRANDOM

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

diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index 6f9d182f9b6a70bf36ab4787bfcd301e31a5eb4b..7997da280bc79b2f66dbf91a848019d091aec8f6 100644 (file)
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -57,40 +57,62 @@
  */
 
 #include <stdio.h>
-#include "crypto.h"
+#include <openssl/crypto.h>
 #include "cryptlib.h"
-#include "lhash.h"
-#include "bn.h"
-#include "rsa.h"
+#include <openssl/lhash.h>
+#include <openssl/bn.h>
+#include <openssl/rsa.h>
 
-char *RSA_version="RSA" OPENSSL_VERSION_PTEXT;
+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_METHOD *RSA_get_default_method(void)
+{
+       return default_RSA_meth;
+}
+
+RSA_METHOD *RSA_get_method(RSA *rsa)
+{
+       return rsa->meth;
+}
+
+RSA_METHOD *RSA_set_method(RSA *rsa, RSA_METHOD *meth)
+{
+       RSA_METHOD *mtmp;
+       mtmp = rsa->meth;
+       if (mtmp->finish) mtmp->finish(rsa);
+       rsa->meth = meth;
+       if (meth->init) meth->init(rsa);
+       return mtmp;
+}
+
+RSA *RSA_new_method(RSA_METHOD *meth)
        {
        RSA *ret;
 
        if (default_RSA_meth == NULL)
                {
+#ifdef RSA_NULL
+               default_RSA_meth=RSA_null_method();
+#else
 #ifdef RSAref
                default_RSA_meth=RSA_PKCS1_RSAref();
 #else
                default_RSA_meth=RSA_PKCS1_SSLeay();
+#endif
 #endif
                }
        ret=(RSA *)Malloc(sizeof(RSA));
@@ -132,8 +154,7 @@ RSA_METHOD *meth;
        return(ret);
        }
 
-void RSA_free(r)
-RSA *r;
+void RSA_free(RSA *r)
        {
        int i;
 
@@ -170,87 +191,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 +253,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;
@@ -295,8 +286,7 @@ err:
        return(ret);
        }
 
-int RSA_memory_lock(r)
-RSA *r;
+int RSA_memory_lock(RSA *r)
        {
        int i,j,k,off;
        char *p;