Constify the RSA library. (29c1f061) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/rsa/rsa.h

+57 −49

Original line number	Diff line number	Diff line
		@@ -78,16 +78,20 @@ typedef struct rsa_st RSA;
		typedef struct rsa_meth_st
		{
		const char *name;
		int (rsa_pub_enc)(int flen,unsigned char from,unsigned char *to,
		int (rsa_pub_enc)(int flen,const unsigned char from,
		unsigned char *to,
		RSA *rsa,int padding);
		int (rsa_pub_dec)(int flen,unsigned char from,unsigned char *to,
		int (rsa_pub_dec)(int flen,const unsigned char from,
		unsigned char *to,
		RSA *rsa,int padding);
		int (rsa_priv_enc)(int flen,unsigned char from,unsigned char *to,
		int (rsa_priv_enc)(int flen,const unsigned char from,
		unsigned char *to,
		RSA *rsa,int padding);
		int (rsa_priv_dec)(int flen,unsigned char from,unsigned char *to,
		int (rsa_priv_dec)(int flen,const unsigned char from,
		unsigned char *to,
		RSA *rsa,int padding);
		int (rsa_mod_exp)(BIGNUM r0,BIGNUM I,RSA rsa); /* Can be null */
		int (bn_mod_exp)(BIGNUM r, BIGNUM a, const BIGNUM p,
		int (rsa_mod_exp)(BIGNUM r0,const BIGNUM I,RSA rsa); /* 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); / Can be null */
		int (init)(RSA rsa); /* called at new */
		@@ -101,10 +105,12 @@ typedef struct rsa_meth_st
		* compatibility this functionality is only enabled if the RSA_FLAG_SIGN_VER
		* option is set in 'flags'.
		*/
		int (rsa_sign)(int type, unsigned char m, unsigned int m_len,
		unsigned char sigret, unsigned int siglen, RSA *rsa);
		int (rsa_verify)(int dtype, unsigned char m, unsigned int m_len,
		unsigned char sigbuf, unsigned int siglen, RSA rsa);
		int (*rsa_sign)(int type,
		const unsigned char *m, unsigned int m_len,
		unsigned char sigret, unsigned int siglen, const RSA *rsa);
		int (*rsa_verify)(int dtype,
		const unsigned char *m, unsigned int m_len,
		unsigned char sigbuf, unsigned int siglen, const RSA rsa);

		} RSA_METHOD;

		@@ -177,26 +183,26 @@ RSA * RSA_new_method(RSA_METHOD *method);
		#else
		RSA * RSA_new_method(struct engine_st *engine);
		#endif
		int RSA_size(RSA *);
		int RSA_size(const RSA *);
		RSA * RSA_generate_key(int bits, unsigned long e,void
		(callback)(int,int,void ),void *cb_arg);
		int RSA_check_key(RSA *);
		int RSA_check_key(const RSA *);
		/* next 4 return -1 on error */
		int RSA_public_encrypt(int flen, unsigned char *from,
		int RSA_public_encrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa,int padding);
		int RSA_private_encrypt(int flen, unsigned char *from,
		int RSA_private_encrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa,int padding);
		int RSA_public_decrypt(int flen, unsigned char *from,
		int RSA_public_decrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa,int padding);
		int RSA_private_decrypt(int flen, unsigned char *from,
		int RSA_private_decrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa,int padding);
		void RSA_free (RSA *r);

		int RSA_flags(RSA *r);
		int RSA_flags(const RSA *r);

		void RSA_set_default_openssl_method(RSA_METHOD *meth);
		RSA_METHOD *RSA_get_default_openssl_method(void);
		RSA_METHOD RSA_get_method(RSA rsa);
		void RSA_set_default_openssl_method(const RSA_METHOD *meth);
		const RSA_METHOD *RSA_get_default_openssl_method(void);
		const RSA_METHOD RSA_get_method(const RSA rsa);
		#if 0
		RSA_METHOD RSA_set_method(RSA rsa, RSA_METHOD *meth);
		#else
		@@ -216,72 +222,74 @@ RSA_METHOD *RSA_null_method(void);

		void ERR_load_RSA_strings(void );

		RSA * d2i_RSAPublicKey(RSA a, unsigned char pp, long length);
		int i2d_RSAPublicKey(RSA a, unsigned char *pp);
		RSA * d2i_RSAPrivateKey(RSA a, unsigned char pp, long length);
		int i2d_RSAPrivateKey(RSA a, unsigned char *pp);
		RSA * d2i_RSAPublicKey(RSA a, const unsigned char pp, long length);
		int i2d_RSAPublicKey(const RSA a, unsigned char *pp);
		RSA * d2i_RSAPrivateKey(RSA a, const unsigned char pp, long length);
		int i2d_RSAPrivateKey(const RSA a, unsigned char *pp);
		#ifndef NO_FP_API
		int RSA_print_fp(FILE fp, RSA r,int offset);
		int RSA_print_fp(FILE fp, const RSA r,int offset);
		#endif

		#ifndef NO_BIO
		int RSA_print(BIO bp, RSA r,int offset);
		int RSA_print(BIO bp, const RSA r,int offset);
		#endif

		int i2d_RSA_NET(RSA a, unsigned char pp, int (cb)(), int sgckey);
		RSA d2i_RSA_NET(RSA a, unsigned char pp, long length, int (cb)(), int sgckey);
		RSA d2i_RSA_NET_2(RSA a, unsigned char pp, long length, int (cb)(), int sgckey);
		int i2d_RSA_NET(const RSA a, unsigned char pp, int (cb)(), int sgckey);
		RSA d2i_RSA_NET(RSA a, const unsigned char pp, long length, int (cb)(), int sgckey);
		RSA d2i_RSA_NET_2(RSA a, const unsigned char pp, long length, int (cb)(), int sgckey);

		int i2d_Netscape_RSA(RSA a, unsigned char pp, int (cb)());
		RSA d2i_Netscape_RSA(RSA a, unsigned char pp, long length, int (cb)());
		int i2d_Netscape_RSA(const RSA a, unsigned char pp, int (cb)());
		RSA d2i_Netscape_RSA(RSA a, const unsigned char pp, long length, int (cb)());
		/* Naughty internal function required elsewhere, to handle a MS structure
		* that is the same as the netscape one :-) */
		RSA d2i_Netscape_RSA_2(RSA a, unsigned char pp, long length, int (cb)());
		RSA d2i_Netscape_RSA_2(RSA a, const unsigned char pp, long length, int (cb)());

		/* The following 2 functions sign and verify a X509_SIG ASN1 object
		* inside PKCS#1 padded RSA encryption */
		int RSA_sign(int type, unsigned char *m, unsigned int m_len,
		int RSA_sign(int type, const unsigned char *m, unsigned int m_len,
		unsigned char sigret, unsigned int siglen, RSA *rsa);
		int RSA_verify(int type, unsigned char *m, unsigned int m_len,
		int RSA_verify(int type, const unsigned char *m, unsigned int m_len,
		unsigned char sigbuf, unsigned int siglen, RSA rsa);

		/* The following 2 function sign and verify a ASN1_OCTET_STRING
		* object inside PKCS#1 padded RSA encryption */
		int RSA_sign_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_len,
		int RSA_sign_ASN1_OCTET_STRING(int type,
		const unsigned char *m, unsigned int m_len,
		unsigned char sigret, unsigned int siglen, RSA *rsa);
		int RSA_verify_ASN1_OCTET_STRING(int type, unsigned char *m, unsigned int m_len,
		int RSA_verify_ASN1_OCTET_STRING(int type,
		const unsigned char *m, unsigned int m_len,
		unsigned char sigbuf, unsigned int siglen, RSA rsa);

		int RSA_blinding_on(RSA rsa, BN_CTX ctx);
		void RSA_blinding_off(RSA *rsa);

		int RSA_padding_add_PKCS1_type_1(unsigned char *to,int tlen,
		unsigned char *f,int fl);
		const unsigned char *f,int fl);
		int RSA_padding_check_PKCS1_type_1(unsigned char *to,int tlen,
		unsigned char *f,int fl,int rsa_len);
		const unsigned char *f,int fl,int rsa_len);
		int RSA_padding_add_PKCS1_type_2(unsigned char *to,int tlen,
		unsigned char *f,int fl);
		const unsigned char *f,int fl);
		int RSA_padding_check_PKCS1_type_2(unsigned char *to,int tlen,
		unsigned char *f,int fl,int rsa_len);
		const unsigned char *f,int fl,int rsa_len);
		int RSA_padding_add_PKCS1_OAEP(unsigned char *to,int tlen,
		unsigned char f,int fl,unsigned char p,
		int pl);
		const unsigned char *f,int fl,
		const unsigned char *p,int pl);
		int RSA_padding_check_PKCS1_OAEP(unsigned char *to,int tlen,
		unsigned char *f,int fl,int rsa_len,
		unsigned char *p,int pl);
		const unsigned char *f,int fl,int rsa_len,
		const unsigned char *p,int pl);
		int RSA_padding_add_SSLv23(unsigned char *to,int tlen,
		unsigned char *f,int fl);
		const unsigned char *f,int fl);
		int RSA_padding_check_SSLv23(unsigned char *to,int tlen,
		unsigned char *f,int fl,int rsa_len);
		const unsigned char *f,int fl,int rsa_len);
		int RSA_padding_add_none(unsigned char *to,int tlen,
		unsigned char *f,int fl);
		const unsigned char *f,int fl);
		int RSA_padding_check_none(unsigned char *to,int tlen,
		unsigned char *f,int fl,int rsa_len);
		const unsigned char *f,int fl,int rsa_len);

		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);
		int RSA_set_ex_data(RSA r,int idx,void arg);
		void RSA_get_ex_data(RSA r, int idx);
		void RSA_get_ex_data(const RSA r, int idx);

		/* BEGIN ERROR CODES */
		/* The following lines are auto generated by the script mkerr.pl. Any changes

crypto/rsa/rsa_chk.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@
		#include <openssl/rsa.h>


		int RSA_check_key(RSA *key)
		int RSA_check_key(const RSA *key)
		{
		BIGNUM i, j, k, l, *m;
		BN_CTX *ctx;

crypto/rsa/rsa_eay.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -65,15 +65,15 @@

		#ifndef RSA_NULL

		static int RSA_eay_public_encrypt(int flen, unsigned char *from,
		static int RSA_eay_public_encrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa,int padding);
		static int RSA_eay_private_encrypt(int flen, unsigned char *from,
		static int RSA_eay_private_encrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa,int padding);
		static int RSA_eay_public_decrypt(int flen, unsigned char *from,
		static int RSA_eay_public_decrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa,int padding);
		static int RSA_eay_private_decrypt(int flen, unsigned char *from,
		static int RSA_eay_private_decrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa,int padding);
		static int RSA_eay_mod_exp(BIGNUM r0, BIGNUM i, RSA *rsa);
		static int RSA_eay_mod_exp(BIGNUM r0, const BIGNUM i, RSA *rsa);
		static int RSA_eay_init(RSA *rsa);
		static int RSA_eay_finish(RSA *rsa);
		static RSA_METHOD rsa_pkcs1_eay_meth={
		@@ -95,7 +95,7 @@ RSA_METHOD *RSA_PKCS1_SSLeay(void)
		return(&rsa_pkcs1_eay_meth);
		}

		static int RSA_eay_public_encrypt(int flen, unsigned char *from,
		static int RSA_eay_public_encrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa, int padding)
		{
		const RSA_METHOD *meth;
		@@ -169,7 +169,7 @@ err:
		return(r);
		}

		static int RSA_eay_private_encrypt(int flen, unsigned char *from,
		static int RSA_eay_private_encrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa, int padding)
		{
		const RSA_METHOD *meth;
		@@ -247,7 +247,7 @@ err:
		return(r);
		}

		static int RSA_eay_private_decrypt(int flen, unsigned char *from,
		static int RSA_eay_private_decrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa, int padding)
		{
		const RSA_METHOD *meth;
		@@ -342,7 +342,7 @@ err:
		return(r);
		}

		static int RSA_eay_public_decrypt(int flen, unsigned char *from,
		static int RSA_eay_public_decrypt(int flen, const unsigned char *from,
		unsigned char to, RSA rsa, int padding)
		{
		const RSA_METHOD *meth;
		@@ -416,7 +416,7 @@ err:
		return(r);
		}

		static int RSA_eay_mod_exp(BIGNUM r0, BIGNUM I, RSA *rsa)
		static int RSA_eay_mod_exp(BIGNUM r0, const BIGNUM I, RSA *rsa)
		{
		const RSA_METHOD *meth;
		BIGNUM r1,m1;

crypto/rsa/rsa_lib.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@

		const char *RSA_version="RSA" OPENSSL_VERSION_PTEXT;

		static RSA_METHOD *default_RSA_meth=NULL;
		static const RSA_METHOD *default_RSA_meth=NULL;
		static int rsa_meth_num=0;
		static STACK_OF(CRYPTO_EX_DATA_FUNCS) *rsa_meth=NULL;

		@@ -75,7 +75,7 @@ RSA *RSA_new(void)
		return(RSA_new_method(NULL));
		}

		void RSA_set_default_openssl_method(RSA_METHOD *meth)
		void RSA_set_default_openssl_method(const RSA_METHOD *meth)
		{
		ENGINE *e;
		/* We'll need to notify the "openssl" ENGINE of this
		@@ -94,7 +94,7 @@ void RSA_set_default_openssl_method(RSA_METHOD *meth)
		}
		}

		RSA_METHOD *RSA_get_default_openssl_method(void)
		const RSA_METHOD *RSA_get_default_openssl_method(void)
		{
		if (default_RSA_meth == NULL)
		{
		@@ -112,7 +112,7 @@ RSA_METHOD *RSA_get_default_openssl_method(void)
		return default_RSA_meth;
		}

		RSA_METHOD RSA_get_method(RSA rsa)
		const RSA_METHOD RSA_get_method(const RSA rsa)
		{
		return ENGINE_get_RSA(rsa->engine);
		}
		@@ -131,7 +131,7 @@ RSA_METHOD RSA_set_method(RSA rsa, RSA_METHOD *meth)
		int RSA_set_method(RSA rsa, ENGINE engine)
		{
		ENGINE *mtmp;
		RSA_METHOD *meth;
		const RSA_METHOD *meth;
		mtmp = rsa->engine;
		meth = ENGINE_get_RSA(mtmp);
		if (!ENGINE_init(engine))
		@@ -152,7 +152,7 @@ RSA RSA_new_method(RSA_METHOD meth)
		RSA RSA_new_method(ENGINE engine)
		#endif
		{
		RSA_METHOD *meth;
		const RSA_METHOD *meth;
		RSA *ret;

		ret=(RSA *)OPENSSL_malloc(sizeof(RSA));
		@@ -203,7 +203,7 @@ RSA RSA_new_method(ENGINE engine)

		void RSA_free(RSA *r)
		{
		RSA_METHOD *meth;
		const RSA_METHOD *meth;
		int i;

		if (r == NULL) return;
		@@ -254,45 +254,45 @@ 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(RSA r, int idx)
		void RSA_get_ex_data(const RSA r, int idx)
		{
		return(CRYPTO_get_ex_data(&r->ex_data,idx));
		}

		int RSA_size(RSA *r)
		int RSA_size(const RSA *r)
		{
		return(BN_num_bytes(r->n));
		}

		int RSA_public_encrypt(int flen, unsigned char from, unsigned char to,
		int RSA_public_encrypt(int flen, const unsigned char from, unsigned char to,
		RSA *rsa, int padding)
		{
		return(ENGINE_get_RSA(rsa->engine)->rsa_pub_enc(flen,
		from, to, rsa, padding));
		}

		int RSA_private_encrypt(int flen, unsigned char from, unsigned char to,
		int RSA_private_encrypt(int flen, const unsigned char from, unsigned char to,
		RSA *rsa, int padding)
		{
		return(ENGINE_get_RSA(rsa->engine)->rsa_priv_enc(flen,
		from, to, rsa, padding));
		}

		int RSA_private_decrypt(int flen, unsigned char from, unsigned char to,
		int RSA_private_decrypt(int flen, const unsigned char from, unsigned char to,
		RSA *rsa, int padding)
		{
		return(ENGINE_get_RSA(rsa->engine)->rsa_priv_dec(flen,
		from, to, rsa, padding));
		}

		int RSA_public_decrypt(int flen, unsigned char from, unsigned char to,
		int RSA_public_decrypt(int flen, const unsigned char from, unsigned char to,
		RSA *rsa, int padding)
		{
		return(ENGINE_get_RSA(rsa->engine)->rsa_pub_dec(flen,
		from, to, rsa, padding));
		}

		int RSA_flags(RSA *r)
		int RSA_flags(const RSA *r)
		{
		return((r == NULL)?0:ENGINE_get_RSA(r->engine)->flags);
		}

crypto/rsa/rsa_none.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -62,8 +62,8 @@
		#include <openssl/rsa.h>
		#include <openssl/rand.h>

		int RSA_padding_add_none(unsigned char to, int tlen, unsigned char from,
		int flen)
		int RSA_padding_add_none(unsigned char *to, int tlen,
		const unsigned char *from, int flen)
		{
		if (flen > tlen)
		{
		@@ -81,8 +81,8 @@ int RSA_padding_add_none(unsigned char to, int tlen, unsigned char from,
		return(1);
		}

		int RSA_padding_check_none(unsigned char to, int tlen, unsigned char from,
		int flen, int num)
		int RSA_padding_check_none(unsigned char *to, int tlen,
		const unsigned char *from, int flen, int num)
		{

		if (flen > tlen)