Commit b72c9121 authored by Richard Levitte's avatar Richard Levitte
Browse files

Make the RSA_METHOD structure opaque 



Move rsa_meth_st away from public headers.
Add RSA_METHOD creator/destructor functions.
Add RSA_METHOD accessor/writer functions.
Adapt all other source to use the creator, destructor, accessors and writers.

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent b879882a

crypto/rsa/Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ LIB=$(TOP)/libcrypto.a 
LIBSRC= rsa_ossl.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \

	rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \

	rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c \

	rsa_pmeth.c rsa_crpt.c rsa_x931g.c

	rsa_pmeth.c rsa_crpt.c rsa_x931g.c rsa_meth.c

LIBOBJ= rsa_ossl.o rsa_gen.o rsa_lib.o rsa_sign.o rsa_saos.o rsa_err.o \

	rsa_pk1.o rsa_ssl.o rsa_none.o rsa_oaep.o rsa_chk.o rsa_null.o \

	rsa_pss.o rsa_x931.o rsa_asn1.o rsa_depr.o rsa_ameth.o rsa_prn.o \

	rsa_pmeth.o rsa_crpt.o rsa_x931g.o

	rsa_pmeth.o rsa_crpt.o rsa_x931g.o rsa_meth.o



SRC= $(LIBSRC)

crypto/rsa/build.info

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ SOURCE[../../libcrypto]=\ 
        rsa_ossl.c rsa_gen.c rsa_lib.c rsa_sign.c rsa_saos.c rsa_err.c \

        rsa_pk1.c rsa_ssl.c rsa_none.c rsa_oaep.c rsa_chk.c rsa_null.c \

        rsa_pss.c rsa_x931.c rsa_asn1.c rsa_depr.c rsa_ameth.c rsa_prn.c \

        rsa_pmeth.c rsa_crpt.c rsa_x931g.c
 
        rsa_pmeth.c rsa_crpt.c rsa_x931g.c rsa_meth.c

crypto/rsa/rsa_locl.h

+45 −0
Original line number Diff line number Diff line
@@ -46,6 +46,51 @@ struct rsa_st { 
    CRYPTO_RWLOCK *lock;

};



struct rsa_meth_st {

    char *name;

    int (*rsa_pub_enc) (int flen, const unsigned char *from,

                        unsigned char *to, RSA *rsa, int padding);

    int (*rsa_pub_dec) (int flen, const unsigned char *from,

                        unsigned char *to, RSA *rsa, int padding);

    int (*rsa_priv_enc) (int flen, const unsigned char *from,

                         unsigned char *to, RSA *rsa, int padding);

    int (*rsa_priv_dec) (int flen, const unsigned char *from,

                         unsigned char *to, RSA *rsa, int padding);

    /* Can be null */

    int (*rsa_mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);

    /* Can be null */

    int (*bn_mod_exp) (BIGNUM *r, const BIGNUM *a, const BIGNUM *p,

                       const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);

    /* called at new */

    int (*init) (RSA *rsa);

    /* called at free */

    int (*finish) (RSA *rsa);

    /* RSA_METHOD_FLAG_* things */

    int flags;

    /* may be needed! */

    char *app_data;

    /*

     * New sign and verify functions: some libraries don't allow arbitrary

     * data to be signed/verified: this allows them to be used. Note: for

     * this to work the RSA_public_decrypt() and RSA_private_encrypt() should

     * *NOT* be used RSA_sign(), RSA_verify() should be used instead.

     */

    int (*rsa_sign) (int type,

                     const unsigned char *m, unsigned int m_length,

                     unsigned char *sigret, unsigned int *siglen,

                     const RSA *rsa);

    int (*rsa_verify) (int dtype, const unsigned char *m,

                       unsigned int m_length, const unsigned char *sigbuf,

                       unsigned int siglen, const RSA *rsa);

    /*

     * If this callback is NULL, the builtin software RSA key-gen will be

     * used. This is for behavioural compatibility whilst the code gets

     * rewired, but one day it would be nice to assume there are no such

     * things as "builtin software" implementations.

     */

    int (*rsa_keygen) (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb);

};



extern int int_rsa_verify(int dtype, const unsigned char *m,

                          unsigned int m_len, unsigned char *rm,

                          size_t *prm_len, const unsigned char *sigbuf,

crypto/rsa/rsa_meth.c

0 → 100644
+257 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL licenses, (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 * https://www.openssl.org/source/license.html

 * or in the file LICENSE in the source distribution.

 */



#include <string.h>

#include "rsa_locl.h"



RSA_METHOD *RSA_meth_new(const char *name, int flags)

{

    RSA_METHOD *meth = OPENSSL_zalloc(sizeof(RSA_METHOD));



    if (meth != NULL) {

        meth->name = OPENSSL_strdup(name);

        meth->flags = flags;

    }



    return meth;

}



void RSA_meth_free(RSA_METHOD *meth)

{

    if (meth != NULL) {

        if (meth->name != NULL)

            OPENSSL_free(meth->name);

        OPENSSL_free(meth);

    }

}



RSA_METHOD *RSA_meth_dup(const RSA_METHOD *meth)

{

    RSA_METHOD *ret;



    ret = OPENSSL_malloc(sizeof(RSA_METHOD));



    if (ret != NULL) {

        memcpy(ret, meth, sizeof(*meth));

        ret->name = OPENSSL_strdup(meth->name);

    }



    return ret;

}



const char *RSA_meth_get0_name(const RSA_METHOD *meth)

{

    return meth->name;

}



int RSA_meth_set1_name(RSA_METHOD *meth, const char *name)

{

    OPENSSL_free(meth->name);

    meth->name = OPENSSL_strdup(name);



    return meth->name != NULL;

}



int RSA_meth_get_flags(RSA_METHOD *meth)

{

    return meth->flags;

}



int RSA_meth_set_flags(RSA_METHOD *meth, int flags)

{

    meth->flags = flags;

    return 1;

}



void *RSA_meth_get0_app_data(const RSA_METHOD *meth)

{

    return meth->app_data;

}



int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data)

{

    meth->app_data = app_data;

    return 1;

}



int (*RSA_meth_get_pub_enc(const RSA_METHOD *meth))

    (int flen, const unsigned char *from,

     unsigned char *to, RSA *rsa, int padding)

{

    return meth->rsa_pub_enc;

}



int RSA_meth_set_pub_enc(RSA_METHOD *meth,

                         int (*pub_enc) (int flen, const unsigned char *from,

                                         unsigned char *to, RSA *rsa,

                                         int padding))

{

    meth->rsa_pub_enc = pub_enc;

    return 1;

}



int (*RSA_meth_get_pub_dec(const RSA_METHOD *meth))

    (int flen, const unsigned char *from,

     unsigned char *to, RSA *rsa, int padding)

{

    return meth->rsa_pub_dec;

}



int RSA_meth_set_pub_dec(RSA_METHOD *meth,

                         int (*pub_dec) (int flen, const unsigned char *from,

                                         unsigned char *to, RSA *rsa,

                                         int padding))

{

    meth->rsa_pub_dec = pub_dec;

    return 1;

}



int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth))

    (int flen, const unsigned char *from,

     unsigned char *to, RSA *rsa, int padding)

{

    return meth->rsa_priv_enc;

}



int RSA_meth_set_priv_enc(RSA_METHOD *meth,

                          int (*priv_enc) (int flen, const unsigned char *from,

                                           unsigned char *to, RSA *rsa,

                                           int padding))

{

    meth->rsa_priv_enc = priv_enc;

    return 1;

}



int (*RSA_meth_get_priv_dec(const RSA_METHOD *meth))

    (int flen, const unsigned char *from,

     unsigned char *to, RSA *rsa, int padding)

{

    return meth->rsa_priv_dec;

}



int RSA_meth_set_priv_dec(RSA_METHOD *meth,

                          int (*priv_dec) (int flen, const unsigned char *from,

                                           unsigned char *to, RSA *rsa,

                                           int padding))

{

    meth->rsa_priv_dec = priv_dec;

    return 1;

}



    /* Can be null */

int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth))

    (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)

{

    return meth->rsa_mod_exp;

}



int RSA_meth_set_mod_exp(RSA_METHOD *meth,

                         int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa,

                                         BN_CTX *ctx))

{

    meth->rsa_mod_exp = mod_exp;

    return 1;

}



    /* Can be null */

int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth))

    (BIGNUM *r, const BIGNUM *a, const BIGNUM *p,

     const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)

{

    return meth->bn_mod_exp;

}



int RSA_meth_set_bn_mod_exp(RSA_METHOD *meth,

                            int (*bn_mod_exp) (BIGNUM *r,

                                               const BIGNUM *a,

                                               const BIGNUM *p,

                                               const BIGNUM *m,

                                               BN_CTX *ctx,

                                               BN_MONT_CTX *m_ctx))

{

    meth->bn_mod_exp = bn_mod_exp;

    return 1;

}



    /* called at new */

int (*RSA_meth_get_init(const RSA_METHOD *meth)) (RSA *rsa)

{

    return meth->init;

}



int RSA_meth_set_init(RSA_METHOD *meth, int (*init) (RSA *rsa))

{

    meth->init = init;

    return 1;

}



    /* called at free */

int (*RSA_meth_get_finish(const RSA_METHOD *meth)) (RSA *rsa)

{

    return meth->finish;

}



int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa))

{

    meth->finish = finish;

    return 1;

}



int (*RSA_meth_get_sign(const RSA_METHOD *meth))

    (int type,

     const unsigned char *m, unsigned int m_length,

     unsigned char *sigret, unsigned int *siglen,

     const RSA *rsa)

{

    return meth->rsa_sign;

}



int RSA_meth_set_sign(RSA_METHOD *meth,

                      int (*sign) (int type, const unsigned char *m,

                                   unsigned int m_length,

                                   unsigned char *sigret, unsigned int *siglen,

                                   const RSA *rsa))

{

    meth->rsa_sign = sign;

    return 1;

}



int (*RSA_meth_get_verify(const RSA_METHOD *meth))

    (int dtype, const unsigned char *m,

     unsigned int m_length, const unsigned char *sigbuf,

     unsigned int siglen, const RSA *rsa)

{

    return meth->rsa_verify;

}



int RSA_meth_set_verify(RSA_METHOD *meth,

                        int (*verify) (int dtype, const unsigned char *m,

                                       unsigned int m_length,

                                       const unsigned char *sigbuf,

                                       unsigned int siglen, const RSA *rsa))

{

    meth->rsa_verify = verify;

    return 1;

}



int (*RSA_meth_get_keygen(const RSA_METHOD *meth))

    (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)

{

    return meth->rsa_keygen;

}



int RSA_meth_set_keygen(RSA_METHOD *meth,

                        int (*keygen) (RSA *rsa, int bits, BIGNUM *e,

                                       BN_GENCB *cb))

{

    meth->rsa_keygen = keygen;

    return 1;

}

crypto/rsa/rsa_null.c

+1 −1
Original line number Diff line number Diff line
@@ -59,8 +59,8 @@ 
#include <stdio.h>

#include "internal/cryptlib.h"

#include <openssl/bn.h>

#include <openssl/rsa.h>

#include <openssl/rand.h>

#include "rsa_locl.h"



/*

 * This is a dummy RSA implementation that just returns errors when called.