Constify DH-related code.
This commit is contained in:
parent
a4aba800d9
commit
f971ccb264
@ -64,7 +64,7 @@
|
|||||||
#include <openssl/objects.h>
|
#include <openssl/objects.h>
|
||||||
#include <openssl/asn1_mac.h>
|
#include <openssl/asn1_mac.h>
|
||||||
|
|
||||||
DH *d2i_DHparams(DH **a, unsigned char **pp, long length)
|
DH *d2i_DHparams(DH **a, const unsigned char **pp, long length)
|
||||||
{
|
{
|
||||||
int i=ERR_R_NESTED_ASN1_ERROR;
|
int i=ERR_R_NESTED_ASN1_ERROR;
|
||||||
ASN1_INTEGER *bs=NULL;
|
ASN1_INTEGER *bs=NULL;
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
#include <openssl/asn1_mac.h>
|
#include <openssl/asn1_mac.h>
|
||||||
#include <openssl/dh.h>
|
#include <openssl/dh.h>
|
||||||
|
|
||||||
int i2d_DHparams(DH *a, unsigned char **pp)
|
int i2d_DHparams(const DH *a, unsigned char **pp)
|
||||||
{
|
{
|
||||||
BIGNUM *num[3];
|
BIGNUM *num[3];
|
||||||
ASN1_INTEGER bs;
|
ASN1_INTEGER bs;
|
||||||
|
@ -261,7 +261,7 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf,
|
|||||||
|
|
||||||
#ifndef NO_DH
|
#ifndef NO_DH
|
||||||
#ifndef NO_FP_API
|
#ifndef NO_FP_API
|
||||||
int DHparams_print_fp(FILE *fp, DH *x)
|
int DHparams_print_fp(FILE *fp, const DH *x)
|
||||||
{
|
{
|
||||||
BIO *b;
|
BIO *b;
|
||||||
int ret;
|
int ret;
|
||||||
@ -278,7 +278,7 @@ int DHparams_print_fp(FILE *fp, DH *x)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int DHparams_print(BIO *bp, DH *x)
|
int DHparams_print(BIO *bp, const DH *x)
|
||||||
{
|
{
|
||||||
unsigned char *m=NULL;
|
unsigned char *m=NULL;
|
||||||
int reason=ERR_R_BUF_LIB,i,ret=0;
|
int reason=ERR_R_BUF_LIB,i,ret=0;
|
||||||
|
@ -81,9 +81,9 @@ typedef struct dh_method {
|
|||||||
const char *name;
|
const char *name;
|
||||||
/* Methods here */
|
/* Methods here */
|
||||||
int (*generate_key)(DH *dh);
|
int (*generate_key)(DH *dh);
|
||||||
int (*compute_key)(unsigned char *key,BIGNUM *pub_key,DH *dh);
|
int (*compute_key)(unsigned char *key,const BIGNUM *pub_key,DH *dh);
|
||||||
int (*bn_mod_exp)(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
|
int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a,
|
||||||
const BIGNUM *m, BN_CTX *ctx,
|
const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,
|
||||||
BN_MONT_CTX *m_ctx); /* Can be null */
|
BN_MONT_CTX *m_ctx); /* Can be null */
|
||||||
|
|
||||||
int (*init)(DH *dh);
|
int (*init)(DH *dh);
|
||||||
@ -152,13 +152,13 @@ struct dh_st
|
|||||||
(unsigned char *)(x))
|
(unsigned char *)(x))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DH_METHOD *DH_OpenSSL(void);
|
const DH_METHOD *DH_OpenSSL(void);
|
||||||
|
|
||||||
void DH_set_default_openssl_method(DH_METHOD *meth);
|
void DH_set_default_openssl_method(const DH_METHOD *meth);
|
||||||
DH_METHOD *DH_get_default_openssl_method(void);
|
const DH_METHOD *DH_get_default_openssl_method(void);
|
||||||
#if 0
|
#if 0
|
||||||
DH_METHOD *DH_set_method(DH *dh, DH_METHOD *meth);
|
const DH_METHOD *DH_set_method(DH *dh, const DH_METHOD *meth);
|
||||||
DH *DH_new_method(DH_METHOD *meth);
|
DH *DH_new_method(const DH_METHOD *meth);
|
||||||
#else
|
#else
|
||||||
int DH_set_method(DH *dh, struct engine_st *engine);
|
int DH_set_method(DH *dh, struct engine_st *engine);
|
||||||
DH *DH_new_method(struct engine_st *engine);
|
DH *DH_new_method(struct engine_st *engine);
|
||||||
@ -166,27 +166,27 @@ DH *DH_new_method(struct engine_st *engine);
|
|||||||
|
|
||||||
DH * DH_new(void);
|
DH * DH_new(void);
|
||||||
void DH_free(DH *dh);
|
void DH_free(DH *dh);
|
||||||
int DH_size(DH *dh);
|
int DH_size(const DH *dh);
|
||||||
int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
|
int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
|
||||||
CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
|
CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
|
||||||
int DH_set_ex_data(DH *d, int idx, void *arg);
|
int DH_set_ex_data(DH *d, int idx, void *arg);
|
||||||
void *DH_get_ex_data(DH *d, int idx);
|
void *DH_get_ex_data(DH *d, int idx);
|
||||||
DH * DH_generate_parameters(int prime_len,int generator,
|
DH * DH_generate_parameters(int prime_len,int generator,
|
||||||
void (*callback)(int,int,void *),void *cb_arg);
|
void (*callback)(int,int,void *),void *cb_arg);
|
||||||
int DH_check(DH *dh,int *codes);
|
int DH_check(const DH *dh,int *codes);
|
||||||
int DH_generate_key(DH *dh);
|
int DH_generate_key(DH *dh);
|
||||||
int DH_compute_key(unsigned char *key,BIGNUM *pub_key,DH *dh);
|
int DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh);
|
||||||
DH * d2i_DHparams(DH **a,unsigned char **pp, long length);
|
DH * d2i_DHparams(DH **a,const unsigned char **pp, long length);
|
||||||
int i2d_DHparams(DH *a,unsigned char **pp);
|
int i2d_DHparams(const DH *a,unsigned char **pp);
|
||||||
#ifndef NO_FP_API
|
#ifndef NO_FP_API
|
||||||
int DHparams_print_fp(FILE *fp, DH *x);
|
int DHparams_print_fp(FILE *fp, const DH *x);
|
||||||
#endif
|
#endif
|
||||||
#ifndef NO_BIO
|
#ifndef NO_BIO
|
||||||
int DHparams_print(BIO *bp, DH *x);
|
int DHparams_print(BIO *bp, const DH *x);
|
||||||
#else
|
#else
|
||||||
int DHparams_print(char *bp, DH *x);
|
int DHparams_print(char *bp, const DH *x);
|
||||||
#endif
|
#endif
|
||||||
void ERR_load_DH_strings(void );
|
void ERR_load_DH_strings(void);
|
||||||
|
|
||||||
/* BEGIN ERROR CODES */
|
/* BEGIN ERROR CODES */
|
||||||
/* The following lines are auto generated by the script mkerr.pl. Any changes
|
/* The following lines are auto generated by the script mkerr.pl. Any changes
|
||||||
|
@ -70,7 +70,7 @@
|
|||||||
* should hold.
|
* should hold.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
int DH_check(DH *dh, int *ret)
|
int DH_check(const DH *dh, int *ret)
|
||||||
{
|
{
|
||||||
int ok=0;
|
int ok=0;
|
||||||
BN_CTX *ctx=NULL;
|
BN_CTX *ctx=NULL;
|
||||||
|
@ -64,8 +64,9 @@
|
|||||||
#include <openssl/engine.h>
|
#include <openssl/engine.h>
|
||||||
|
|
||||||
static int generate_key(DH *dh);
|
static int generate_key(DH *dh);
|
||||||
static int compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh);
|
static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh);
|
||||||
static int dh_bn_mod_exp(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
|
static int dh_bn_mod_exp(const DH *dh, BIGNUM *r,
|
||||||
|
const BIGNUM *a, const BIGNUM *p,
|
||||||
const BIGNUM *m, BN_CTX *ctx,
|
const BIGNUM *m, BN_CTX *ctx,
|
||||||
BN_MONT_CTX *m_ctx);
|
BN_MONT_CTX *m_ctx);
|
||||||
static int dh_init(DH *dh);
|
static int dh_init(DH *dh);
|
||||||
@ -76,7 +77,7 @@ int DH_generate_key(DH *dh)
|
|||||||
return ENGINE_get_DH(dh->engine)->generate_key(dh);
|
return ENGINE_get_DH(dh->engine)->generate_key(dh);
|
||||||
}
|
}
|
||||||
|
|
||||||
int DH_compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
|
int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
|
||||||
{
|
{
|
||||||
return ENGINE_get_DH(dh->engine)->compute_key(key, pub_key, dh);
|
return ENGINE_get_DH(dh->engine)->compute_key(key, pub_key, dh);
|
||||||
}
|
}
|
||||||
@ -92,7 +93,7 @@ dh_finish,
|
|||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
DH_METHOD *DH_OpenSSL(void)
|
const DH_METHOD *DH_OpenSSL(void)
|
||||||
{
|
{
|
||||||
return &dh_ossl;
|
return &dh_ossl;
|
||||||
}
|
}
|
||||||
@ -155,7 +156,7 @@ err:
|
|||||||
return(ok);
|
return(ok);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int compute_key(unsigned char *key, BIGNUM *pub_key, DH *dh)
|
static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
|
||||||
{
|
{
|
||||||
BN_CTX ctx;
|
BN_CTX ctx;
|
||||||
BN_MONT_CTX *mont;
|
BN_MONT_CTX *mont;
|
||||||
@ -193,7 +194,8 @@ err:
|
|||||||
return(ret);
|
return(ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dh_bn_mod_exp(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
|
static int dh_bn_mod_exp(const DH *dh, BIGNUM *r,
|
||||||
|
const BIGNUM *a, const BIGNUM *p,
|
||||||
const BIGNUM *m, BN_CTX *ctx,
|
const BIGNUM *m, BN_CTX *ctx,
|
||||||
BN_MONT_CTX *m_ctx)
|
BN_MONT_CTX *m_ctx)
|
||||||
{
|
{
|
||||||
|
@ -64,11 +64,11 @@
|
|||||||
|
|
||||||
const char *DH_version="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
|
const char *DH_version="Diffie-Hellman" OPENSSL_VERSION_PTEXT;
|
||||||
|
|
||||||
static DH_METHOD *default_DH_method;
|
static const DH_METHOD *default_DH_method;
|
||||||
static int dh_meth_num = 0;
|
static int dh_meth_num = 0;
|
||||||
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dh_meth = NULL;
|
static STACK_OF(CRYPTO_EX_DATA_FUNCS) *dh_meth = NULL;
|
||||||
|
|
||||||
void DH_set_default_openssl_method(DH_METHOD *meth)
|
void DH_set_default_openssl_method(const DH_METHOD *meth)
|
||||||
{
|
{
|
||||||
ENGINE *e;
|
ENGINE *e;
|
||||||
/* We'll need to notify the "openssl" ENGINE of this
|
/* We'll need to notify the "openssl" ENGINE of this
|
||||||
@ -87,7 +87,7 @@ void DH_set_default_openssl_method(DH_METHOD *meth)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
DH_METHOD *DH_get_default_openssl_method(void)
|
const DH_METHOD *DH_get_default_openssl_method(void)
|
||||||
{
|
{
|
||||||
if(!default_DH_method) default_DH_method = DH_OpenSSL();
|
if(!default_DH_method) default_DH_method = DH_OpenSSL();
|
||||||
return default_DH_method;
|
return default_DH_method;
|
||||||
@ -107,7 +107,7 @@ DH_METHOD *DH_set_method(DH *dh, DH_METHOD *meth)
|
|||||||
int DH_set_method(DH *dh, ENGINE *engine)
|
int DH_set_method(DH *dh, ENGINE *engine)
|
||||||
{
|
{
|
||||||
ENGINE *mtmp;
|
ENGINE *mtmp;
|
||||||
DH_METHOD *meth;
|
const DH_METHOD *meth;
|
||||||
mtmp = dh->engine;
|
mtmp = dh->engine;
|
||||||
meth = ENGINE_get_DH(mtmp);
|
meth = ENGINE_get_DH(mtmp);
|
||||||
if (!ENGINE_init(engine))
|
if (!ENGINE_init(engine))
|
||||||
@ -133,7 +133,7 @@ DH *DH_new_method(DH_METHOD *meth)
|
|||||||
DH *DH_new_method(ENGINE *engine)
|
DH *DH_new_method(ENGINE *engine)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
DH_METHOD *meth;
|
const DH_METHOD *meth;
|
||||||
DH *ret;
|
DH *ret;
|
||||||
ret=(DH *)OPENSSL_malloc(sizeof(DH));
|
ret=(DH *)OPENSSL_malloc(sizeof(DH));
|
||||||
|
|
||||||
@ -180,7 +180,7 @@ DH *DH_new_method(ENGINE *engine)
|
|||||||
|
|
||||||
void DH_free(DH *r)
|
void DH_free(DH *r)
|
||||||
{
|
{
|
||||||
DH_METHOD *meth;
|
const DH_METHOD *meth;
|
||||||
int i;
|
int i;
|
||||||
if(r == NULL) return;
|
if(r == NULL) return;
|
||||||
i = CRYPTO_add(&r->references, -1, CRYPTO_LOCK_DH);
|
i = CRYPTO_add(&r->references, -1, CRYPTO_LOCK_DH);
|
||||||
@ -231,7 +231,7 @@ void *DH_get_ex_data(DH *d, int idx)
|
|||||||
return(CRYPTO_get_ex_data(&d->ex_data,idx));
|
return(CRYPTO_get_ex_data(&d->ex_data,idx));
|
||||||
}
|
}
|
||||||
|
|
||||||
int DH_size(DH *dh)
|
int DH_size(const DH *dh)
|
||||||
{
|
{
|
||||||
return(BN_num_bytes(dh->p));
|
return(BN_num_bytes(dh->p));
|
||||||
}
|
}
|
||||||
|
@ -180,7 +180,7 @@ int ENGINE_set_id(ENGINE *e, const char *id);
|
|||||||
int ENGINE_set_name(ENGINE *e, const char *name);
|
int ENGINE_set_name(ENGINE *e, const char *name);
|
||||||
int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
|
int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth);
|
||||||
int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
|
int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth);
|
||||||
int ENGINE_set_DH(ENGINE *e, DH_METHOD *dh_meth);
|
int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth);
|
||||||
int ENGINE_set_RAND(ENGINE *e, RAND_METHOD *rand_meth);
|
int ENGINE_set_RAND(ENGINE *e, RAND_METHOD *rand_meth);
|
||||||
int ENGINE_set_BN_mod_exp(ENGINE *e, BN_MOD_EXP bn_mod_exp);
|
int ENGINE_set_BN_mod_exp(ENGINE *e, BN_MOD_EXP bn_mod_exp);
|
||||||
int ENGINE_set_BN_mod_exp_crt(ENGINE *e, BN_MOD_EXP_CRT bn_mod_exp_crt);
|
int ENGINE_set_BN_mod_exp_crt(ENGINE *e, BN_MOD_EXP_CRT bn_mod_exp_crt);
|
||||||
@ -197,7 +197,7 @@ const char *ENGINE_get_id(ENGINE *e);
|
|||||||
const char *ENGINE_get_name(ENGINE *e);
|
const char *ENGINE_get_name(ENGINE *e);
|
||||||
const RSA_METHOD *ENGINE_get_RSA(ENGINE *e);
|
const RSA_METHOD *ENGINE_get_RSA(ENGINE *e);
|
||||||
const DSA_METHOD *ENGINE_get_DSA(ENGINE *e);
|
const DSA_METHOD *ENGINE_get_DSA(ENGINE *e);
|
||||||
DH_METHOD *ENGINE_get_DH(ENGINE *e);
|
const DH_METHOD *ENGINE_get_DH(ENGINE *e);
|
||||||
RAND_METHOD *ENGINE_get_RAND(ENGINE *e);
|
RAND_METHOD *ENGINE_get_RAND(ENGINE *e);
|
||||||
BN_MOD_EXP ENGINE_get_BN_mod_exp(ENGINE *e);
|
BN_MOD_EXP ENGINE_get_BN_mod_exp(ENGINE *e);
|
||||||
BN_MOD_EXP_CRT ENGINE_get_BN_mod_exp_crt(ENGINE *e);
|
BN_MOD_EXP_CRT ENGINE_get_BN_mod_exp_crt(ENGINE *e);
|
||||||
|
@ -84,7 +84,7 @@ struct engine_st
|
|||||||
const char *name;
|
const char *name;
|
||||||
const RSA_METHOD *rsa_meth;
|
const RSA_METHOD *rsa_meth;
|
||||||
const DSA_METHOD *dsa_meth;
|
const DSA_METHOD *dsa_meth;
|
||||||
DH_METHOD *dh_meth;
|
const DH_METHOD *dh_meth;
|
||||||
RAND_METHOD *rand_meth;
|
RAND_METHOD *rand_meth;
|
||||||
BN_MOD_EXP bn_mod_exp;
|
BN_MOD_EXP bn_mod_exp;
|
||||||
BN_MOD_EXP_CRT bn_mod_exp_crt;
|
BN_MOD_EXP_CRT bn_mod_exp_crt;
|
||||||
|
@ -454,7 +454,7 @@ int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
int ENGINE_set_DH(ENGINE *e, DH_METHOD *dh_meth)
|
int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth)
|
||||||
{
|
{
|
||||||
if((e == NULL) || (dh_meth == NULL))
|
if((e == NULL) || (dh_meth == NULL))
|
||||||
{
|
{
|
||||||
@ -582,7 +582,7 @@ const DSA_METHOD *ENGINE_get_DSA(ENGINE *e)
|
|||||||
return e->dsa_meth;
|
return e->dsa_meth;
|
||||||
}
|
}
|
||||||
|
|
||||||
DH_METHOD *ENGINE_get_DH(ENGINE *e)
|
const DH_METHOD *ENGINE_get_DH(ENGINE *e)
|
||||||
{
|
{
|
||||||
if(e == NULL)
|
if(e == NULL)
|
||||||
{
|
{
|
||||||
|
@ -95,7 +95,8 @@ static int atalla_mod_exp_dsa(DSA *dsa, BIGNUM *r, BIGNUM *a,
|
|||||||
|
|
||||||
/* DH stuff */
|
/* DH stuff */
|
||||||
/* This function is alised to mod_exp (with the DH and mont dropped). */
|
/* This function is alised to mod_exp (with the DH and mont dropped). */
|
||||||
static int atalla_mod_exp_dh(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
|
static int atalla_mod_exp_dh(const DH *dh, BIGNUM *r,
|
||||||
|
const BIGNUM *a, const BIGNUM *p,
|
||||||
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
|
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
|
||||||
|
|
||||||
|
|
||||||
@ -172,7 +173,7 @@ ENGINE *ENGINE_atalla()
|
|||||||
{
|
{
|
||||||
const RSA_METHOD *meth1;
|
const RSA_METHOD *meth1;
|
||||||
const DSA_METHOD *meth2;
|
const DSA_METHOD *meth2;
|
||||||
DH_METHOD *meth3;
|
const DH_METHOD *meth3;
|
||||||
|
|
||||||
/* We know that the "PKCS1_SSLeay()" functions hook properly
|
/* We know that the "PKCS1_SSLeay()" functions hook properly
|
||||||
* to the atalla-specific mod_exp and mod_exp_crt so we use
|
* to the atalla-specific mod_exp and mod_exp_crt so we use
|
||||||
@ -433,7 +434,8 @@ static int atalla_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* This function is aliased to mod_exp (with the dh and mont dropped). */
|
/* This function is aliased to mod_exp (with the dh and mont dropped). */
|
||||||
static int atalla_mod_exp_dh(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
|
static int atalla_mod_exp_dh(const DH *dh, BIGNUM *r,
|
||||||
|
const BIGNUM *a, const BIGNUM *p,
|
||||||
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
|
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
|
||||||
{
|
{
|
||||||
return atalla_mod_exp(r, a, p, m, ctx);
|
return atalla_mod_exp(r, a, p, m, ctx);
|
||||||
|
@ -107,7 +107,8 @@ static int cswift_dsa_verify(const unsigned char *dgst, int dgst_len,
|
|||||||
|
|
||||||
/* DH stuff */
|
/* DH stuff */
|
||||||
/* This function is alised to mod_exp (with the DH and mont dropped). */
|
/* This function is alised to mod_exp (with the DH and mont dropped). */
|
||||||
static int cswift_mod_exp_dh(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
|
static int cswift_mod_exp_dh(const DH *dh, BIGNUM *r,
|
||||||
|
const BIGNUM *a, const BIGNUM *p,
|
||||||
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
|
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
|
||||||
|
|
||||||
|
|
||||||
@ -183,7 +184,7 @@ static ENGINE engine_cswift =
|
|||||||
ENGINE *ENGINE_cswift()
|
ENGINE *ENGINE_cswift()
|
||||||
{
|
{
|
||||||
const RSA_METHOD *meth1;
|
const RSA_METHOD *meth1;
|
||||||
DH_METHOD *meth2;
|
const DH_METHOD *meth2;
|
||||||
|
|
||||||
/* We know that the "PKCS1_SSLeay()" functions hook properly
|
/* We know that the "PKCS1_SSLeay()" functions hook properly
|
||||||
* to the cswift-specific mod_exp and mod_exp_crt so we use
|
* to the cswift-specific mod_exp and mod_exp_crt so we use
|
||||||
@ -796,7 +797,8 @@ err:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* This function is aliased to mod_exp (with the dh and mont dropped). */
|
/* This function is aliased to mod_exp (with the dh and mont dropped). */
|
||||||
static int cswift_mod_exp_dh(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
|
static int cswift_mod_exp_dh(const DH *dh, BIGNUM *r,
|
||||||
|
const BIGNUM *a, const BIGNUM *p,
|
||||||
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
|
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
|
||||||
{
|
{
|
||||||
return cswift_mod_exp(r, a, p, m, ctx);
|
return cswift_mod_exp(r, a, p, m, ctx);
|
||||||
|
@ -104,7 +104,8 @@ static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
|
|||||||
|
|
||||||
/* DH stuff */
|
/* DH stuff */
|
||||||
/* This function is alised to mod_exp (with the DH and mont dropped). */
|
/* This function is alised to mod_exp (with the DH and mont dropped). */
|
||||||
static int hwcrhk_mod_exp_dh(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
|
static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r,
|
||||||
|
const BIGNUM *a, const BIGNUM *p,
|
||||||
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
|
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
|
||||||
|
|
||||||
/* RAND stuff */
|
/* RAND stuff */
|
||||||
@ -292,7 +293,7 @@ static HWCryptoHook_InitInfo hwcrhk_globals = {
|
|||||||
ENGINE *ENGINE_ncipher()
|
ENGINE *ENGINE_ncipher()
|
||||||
{
|
{
|
||||||
const RSA_METHOD *meth1;
|
const RSA_METHOD *meth1;
|
||||||
DH_METHOD *meth2;
|
const DH_METHOD *meth2;
|
||||||
|
|
||||||
/* We know that the "PKCS1_SSLeay()" functions hook properly
|
/* We know that the "PKCS1_SSLeay()" functions hook properly
|
||||||
* to the cswift-specific mod_exp and mod_exp_crt so we use
|
* to the cswift-specific mod_exp and mod_exp_crt so we use
|
||||||
@ -860,7 +861,8 @@ static int hwcrhk_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* This function is aliased to mod_exp (with the dh and mont dropped). */
|
/* This function is aliased to mod_exp (with the dh and mont dropped). */
|
||||||
static int hwcrhk_mod_exp_dh(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
|
static int hwcrhk_mod_exp_dh(const DH *dh, BIGNUM *r,
|
||||||
|
const BIGNUM *a, const BIGNUM *p,
|
||||||
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
|
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
|
||||||
{
|
{
|
||||||
return hwcrhk_mod_exp(r, a, p, m, ctx);
|
return hwcrhk_mod_exp(r, a, p, m, ctx);
|
||||||
|
@ -177,7 +177,8 @@ static int nuron_mod_exp_mont(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* This function is aliased to mod_exp (with the dh and mont dropped). */
|
/* This function is aliased to mod_exp (with the dh and mont dropped). */
|
||||||
static int nuron_mod_exp_dh(DH *dh, BIGNUM *r, BIGNUM *a, const BIGNUM *p,
|
static int nuron_mod_exp_dh(const DH *dh, BIGNUM *r,
|
||||||
|
const BIGNUM *a, const BIGNUM *p,
|
||||||
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
|
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
|
||||||
{
|
{
|
||||||
return nuron_mod_exp(r, a, p, m, ctx);
|
return nuron_mod_exp(r, a, p, m, ctx);
|
||||||
@ -252,7 +253,7 @@ ENGINE *ENGINE_nuron()
|
|||||||
{
|
{
|
||||||
const RSA_METHOD *meth1;
|
const RSA_METHOD *meth1;
|
||||||
const DSA_METHOD *meth2;
|
const DSA_METHOD *meth2;
|
||||||
DH_METHOD *meth3;
|
const DH_METHOD *meth3;
|
||||||
|
|
||||||
/* We know that the "PKCS1_SSLeay()" functions hook properly
|
/* We know that the "PKCS1_SSLeay()" functions hook properly
|
||||||
* to the nuron-specific mod_exp and mod_exp_crt so we use
|
* to the nuron-specific mod_exp and mod_exp_crt so we use
|
||||||
|
Loading…
x
Reference in New Issue
Block a user