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

Constify DH-related code.

parent a4aba800

crypto/asn1/d2i_dhp.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
#include <openssl/objects.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;

	ASN1_INTEGER *bs=NULL;

crypto/asn1/i2d_dhp.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
#include <openssl/asn1_mac.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];

	ASN1_INTEGER bs;

crypto/asn1/t_pkey.c

+2 −2
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf, 


#ifndef NO_DH

#ifndef NO_FP_API

int DHparams_print_fp(FILE *fp, DH *x)

int DHparams_print_fp(FILE *fp, const DH *x)

        {

        BIO *b;

        int ret;
@@ -278,7 +278,7 @@ int DHparams_print_fp(FILE *fp, DH *x) 
        }

#endif



int DHparams_print(BIO *bp, DH *x)

int DHparams_print(BIO *bp, const DH *x)

	{

	unsigned char *m=NULL;

	int reason=ERR_R_BUF_LIB,i,ret=0;

crypto/dh/dh.h

+17 −17
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ typedef struct dh_method { 
	const char *name;

	/* Methods here */

	int (*generate_key)(DH *dh);

	int (*compute_key)(unsigned char *key,BIGNUM *pub_key,DH *dh);

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

				const BIGNUM *m, BN_CTX *ctx,

	int (*compute_key)(unsigned char *key,const BIGNUM *pub_key,DH *dh);

	int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a,

				const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,

				BN_MONT_CTX *m_ctx); /* Can be null */



	int (*init)(DH *dh);
@@ -152,13 +152,13 @@ struct dh_st 
		(unsigned char *)(x))

#endif



DH_METHOD *DH_OpenSSL(void);

const DH_METHOD *DH_OpenSSL(void);



void DH_set_default_openssl_method(DH_METHOD *meth);

DH_METHOD *DH_get_default_openssl_method(void);

void DH_set_default_openssl_method(const DH_METHOD *meth);

const DH_METHOD *DH_get_default_openssl_method(void);

#if 0

DH_METHOD *DH_set_method(DH *dh, DH_METHOD *meth);

DH *DH_new_method(DH_METHOD *meth);

const DH_METHOD *DH_set_method(DH *dh, const DH_METHOD *meth);

DH *DH_new_method(const DH_METHOD *meth);

#else

int DH_set_method(DH *dh, struct engine_st *engine);

DH *DH_new_method(struct engine_st *engine);
@@ -166,25 +166,25 @@ DH *DH_new_method(struct engine_st *engine); 


DH *	DH_new(void);

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,

	     CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);

int DH_set_ex_data(DH *d, int idx, void *arg);

void *DH_get_ex_data(DH *d, int idx);

DH *	DH_generate_parameters(int prime_len,int generator,

		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_compute_key(unsigned char *key,BIGNUM *pub_key,DH *dh);

DH *	d2i_DHparams(DH **a,unsigned char **pp, long length);

int	i2d_DHparams(DH *a,unsigned char **pp);

int	DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh);

DH *	d2i_DHparams(DH **a,const unsigned char **pp, long length);

int	i2d_DHparams(const DH *a,unsigned char **pp);

#ifndef NO_FP_API

int	DHparams_print_fp(FILE *fp, DH *x);

int	DHparams_print_fp(FILE *fp, const DH *x);

#endif

#ifndef NO_BIO

int	DHparams_print(BIO *bp, DH *x);

int	DHparams_print(BIO *bp, const DH *x);

#else

int	DHparams_print(char *bp, DH *x);

int	DHparams_print(char *bp, const DH *x);

#endif

void	ERR_load_DH_strings(void);

crypto/dh/dh_check.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ 
 * should hold.

 */



int DH_check(DH *dh, int *ret)

int DH_check(const DH *dh, int *ret)

	{

	int ok=0;

	BN_CTX *ctx=NULL;