Update from HEAD
[oweals/openssl.git] / crypto / rsa / rsa_lib.c
index 66cd15ff6d90f3575255275ff866e9902782424b..5714841f4cabf24d48833f20d440153eae6735c3 100644 (file)
 #include <openssl/engine.h>
 #endif
 
-const char *RSA_version="RSA" OPENSSL_VERSION_PTEXT;
-
-static const RSA_METHOD *default_RSA_meth=NULL;
-
-RSA *RSA_new(void)
-       {
-       RSA *r=RSA_new_method(NULL);
-
-       return r;
-       }
-
-void RSA_set_default_method(const RSA_METHOD *meth)
-       {
-       default_RSA_meth = meth;
-       }
-
-const RSA_METHOD *RSA_get_default_method(void)
-       {
-       if (default_RSA_meth == NULL)
-               {
-#ifdef RSA_NULL
-               default_RSA_meth=RSA_null_method();
-#else
-#if 0 /* was: #ifdef RSAref */
-               default_RSA_meth=RSA_PKCS1_RSAref();
-#else
-               default_RSA_meth=RSA_PKCS1_SSLeay();
-#endif
-#endif
-               }
-
-       return default_RSA_meth;
-       }
-
-const RSA_METHOD *RSA_get_method(const RSA *rsa)
-       {
-       return rsa->meth;
-       }
-
-int RSA_set_method(RSA *rsa, const RSA_METHOD *meth)
-       {
-       /* NB: The caller is specifically setting a method, so it's not up to us
-        * to deal with which ENGINE it comes from. */
-       const RSA_METHOD *mtmp;
-       mtmp = rsa->meth;
-       if (mtmp->finish) mtmp->finish(rsa);
-#ifndef OPENSSL_NO_ENGINE
-       if (rsa->engine)
-               {
-               ENGINE_finish(rsa->engine);
-               rsa->engine = NULL;
-               }
-#endif
-       rsa->meth = meth;
-       if (meth->init) meth->init(rsa);
-       return 1;
-       }
-
-RSA *RSA_new_method(ENGINE *engine)
-       {
-       RSA *ret;
-
-       ret=(RSA *)OPENSSL_malloc(sizeof(RSA));
-       if (ret == NULL)
-               {
-               RSAerr(RSA_F_RSA_NEW_METHOD,ERR_R_MALLOC_FAILURE);
-               return NULL;
-               }
-
-       ret->meth = RSA_get_default_method();
-#ifndef OPENSSL_NO_ENGINE
-       if (engine)
-               {
-               if (!ENGINE_init(engine))
-                       {
-                       RSAerr(RSA_F_RSA_NEW_METHOD, ERR_R_ENGINE_LIB);
-                       OPENSSL_free(ret);
-                       return NULL;
-                       }
-               ret->engine = engine;
-               }
-       else
-               ret->engine = ENGINE_get_default_RSA();
-       if(ret->engine)
-               {
-               ret->meth = ENGINE_get_RSA(ret->engine);
-               if(!ret->meth)
-                       {
-                       RSAerr(RSA_F_RSA_NEW_METHOD,
-                               ERR_R_ENGINE_LIB);
-                       ENGINE_finish(ret->engine);
-                       OPENSSL_free(ret);
-                       return NULL;
-                       }
-               }
-#endif
-
-       ret->pad=0;
-       ret->version=0;
-       ret->n=NULL;
-       ret->e=NULL;
-       ret->d=NULL;
-       ret->p=NULL;
-       ret->q=NULL;
-       ret->dmp1=NULL;
-       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->blinding=NULL;
-       ret->mt_blinding=NULL;
-       ret->bignum_data=NULL;
-       ret->flags=ret->meth->flags;
-       CRYPTO_new_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data);
-       if ((ret->meth->init != NULL) && !ret->meth->init(ret))
-               {
-#ifndef OPENSSL_NO_ENGINE
-               if (ret->engine)
-                       ENGINE_finish(ret->engine);
-#endif
-               CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, ret, &ret->ex_data);
-               OPENSSL_free(ret);
-               ret=NULL;
-               }
-       return(ret);
-       }
-
-void RSA_free(RSA *r)
-       {
-       int i;
-
-       if (r == NULL) return;
-
-       i=CRYPTO_add(&r->references,-1,CRYPTO_LOCK_RSA);
-#ifdef REF_PRINT
-       REF_PRINT("RSA",r);
-#endif
-       if (i > 0) return;
-#ifdef REF_CHECK
-       if (i < 0)
-               {
-               fprintf(stderr,"RSA_free, bad reference count\n");
-               abort();
-               }
-#endif
-
-       if (r->meth->finish)
-               r->meth->finish(r);
-#ifndef OPENSSL_NO_ENGINE
-       if (r->engine)
-               ENGINE_finish(r->engine);
-#endif
-
-       CRYPTO_free_ex_data(CRYPTO_EX_INDEX_RSA, r, &r->ex_data);
-
-       if (r->n != NULL) BN_clear_free(r->n);
-       if (r->e != NULL) BN_clear_free(r->e);
-       if (r->d != NULL) BN_clear_free(r->d);
-       if (r->p != NULL) BN_clear_free(r->p);
-       if (r->q != NULL) BN_clear_free(r->q);
-       if (r->dmp1 != NULL) BN_clear_free(r->dmp1);
-       if (r->dmq1 != NULL) BN_clear_free(r->dmq1);
-       if (r->iqmp != NULL) BN_clear_free(r->iqmp);
-       if (r->blinding != NULL) BN_BLINDING_free(r->blinding);
-       if (r->mt_blinding != NULL) BN_BLINDING_free(r->mt_blinding);
-       if (r->bignum_data != NULL) OPENSSL_free_locked(r->bignum_data);
-       OPENSSL_free(r);
-       }
-
-int RSA_up_ref(RSA *r)
-       {
-       int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_RSA);
-#ifdef REF_PRINT
-       REF_PRINT("RSA",r);
-#endif
-#ifdef REF_CHECK
-       if (i < 2)
-               {
-               fprintf(stderr, "RSA_up_ref, bad reference count\n");
-               abort();
-               }
-#endif
-       return ((i > 1) ? 1 : 0);
-       }
-
-int RSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
-            CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
-        {
-       return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_RSA, argl, argp,
-                               new_func, dup_func, free_func);
-        }
-
-int RSA_set_ex_data(RSA *r, int idx, void *arg)
-       {
-       return(CRYPTO_set_ex_data(&r->ex_data,idx,arg));
-       }
-
-void *RSA_get_ex_data(const RSA *r, int idx)
-       {
-       return(CRYPTO_get_ex_data(&r->ex_data,idx));
-       }
-
-int RSA_size(const RSA *r)
-       {
-       return(BN_num_bytes(r->n));
-       }
-
 int RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
             RSA *rsa, int padding)
        {
@@ -285,6 +76,13 @@ int RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
 int RSA_private_encrypt(int flen, const unsigned char *from, unsigned char *to,
             RSA *rsa, int padding)
        {
+#ifdef OPENSSL_FIPS
+       if(FIPS_mode() && !(rsa->flags & RSA_FLAG_NON_FIPS_ALLOW))
+               {
+               RSAerr(RSA_F_RSA_PRIVATE_ENCRYPT, RSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE);
+               return 0;
+               }
+#endif
        return(rsa->meth->rsa_priv_enc(flen, from, to, rsa, padding));
        }
 
@@ -297,12 +95,19 @@ int RSA_private_decrypt(int flen, const unsigned char *from, unsigned char *to,
 int RSA_public_decrypt(int flen, const unsigned char *from, unsigned char *to,
             RSA *rsa, int padding)
        {
+#ifdef OPENSSL_FIPS
+       if(FIPS_mode() && !(rsa->flags & RSA_FLAG_NON_FIPS_ALLOW))
+               {
+               RSAerr(RSA_F_RSA_PUBLIC_DECRYPT, RSA_R_OPERATION_NOT_ALLOWED_IN_FIPS_MODE);
+               return 0;
+               }
+#endif
        return(rsa->meth->rsa_pub_dec(flen, from, to, rsa, padding));
        }
 
-int RSA_flags(const RSA *r)
+int RSA_size(const RSA *r)
        {
-       return((r == NULL)?0:r->meth->flags);
+       return(BN_num_bytes(r->n));
        }
 
 void RSA_blinding_off(RSA *rsa)
@@ -361,7 +166,8 @@ err:
 
 BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *in_ctx)
 {
-       BIGNUM *e;
+       BIGNUM local_n;
+       BIGNUM *e,*n;
        BN_CTX *ctx;
        BN_BLINDING *ret = NULL;
 
@@ -400,7 +206,16 @@ BN_BLINDING *RSA_setup_blinding(RSA *rsa, BN_CTX *in_ctx)
                RAND_add(rsa->d->d, rsa->d->dmax * sizeof rsa->d->d[0], 0.0);
                }
 
-       ret = BN_BLINDING_create_param(NULL, e, rsa->n, ctx,
+       if (!(rsa->flags & RSA_FLAG_NO_CONSTTIME))
+               {
+               /* Set BN_FLG_CONSTTIME flag */
+               n = &local_n;
+               BN_with_flags(n, rsa->n, BN_FLG_CONSTTIME);
+               }
+       else
+               n = rsa->n;
+
+       ret = BN_BLINDING_create_param(NULL, e, n, ctx,
                        rsa->meth->bn_mod_exp, rsa->_method_mod_n);
        if (ret == NULL)
                {
@@ -417,48 +232,3 @@ err:
 
        return ret;
 }
-
-int RSA_memory_lock(RSA *r)
-       {
-       int i,j,k,off;
-       char *p;
-       BIGNUM *bn,**t[6],*b;
-       BN_ULONG *ul;
-
-       if (r->d == NULL) return(1);
-       t[0]= &r->d;
-       t[1]= &r->p;
-       t[2]= &r->q;
-       t[3]= &r->dmp1;
-       t[4]= &r->dmq1;
-       t[5]= &r->iqmp;
-       k=sizeof(BIGNUM)*6;
-       off=k/sizeof(BN_ULONG)+1;
-       j=1;
-       for (i=0; i<6; i++)
-               j+= (*t[i])->top;
-       if ((p=OPENSSL_malloc_locked((off+j)*sizeof(BN_ULONG))) == NULL)
-               {
-               RSAerr(RSA_F_RSA_MEMORY_LOCK,ERR_R_MALLOC_FAILURE);
-               return(0);
-               }
-       bn=(BIGNUM *)p;
-       ul=(BN_ULONG *)&(p[off]);
-       for (i=0; i<6; i++)
-               {
-               b= *(t[i]);
-               *(t[i])= &(bn[i]);
-               memcpy((char *)&(bn[i]),(char *)b,sizeof(BIGNUM));
-               bn[i].flags=BN_FLG_STATIC_DATA;
-               bn[i].d=ul;
-               memcpy((char *)ul,b->d,sizeof(BN_ULONG)*b->top);
-               ul+=b->top;
-               BN_clear_free(b);
-               }
-       
-       /* I should fix this so it can still be done */
-       r->flags&= ~(RSA_FLAG_CACHE_PRIVATE|RSA_FLAG_CACHE_PUBLIC);
-
-       r->bignum_data=p;
-       return(1);
-       }