Attachment #83212 for bug #118902

View | Details | Raw Unified | Return to bug 118902
Collapse All | Expand All




.Ve
.PP
.Vb 1
\& RSA * d2i_RSAPublicKey(RSA **a, const unsigned char **pp, long length);
.Ve
.PP
.Vb 1

.Ve
.PP
.Vb 1
\& RSA * d2i_RSA_PUBKEY(RSA **a, const unsigned char **pp, long length);
.Ve
.PP
.Vb 1

.Ve
.PP
.Vb 1
\& RSA * d2i_RSAPrivateKey(RSA **a, const unsigned char **pp, long length);
.Ve
.PP
.Vb 1

.Ve
.PP
.Vb 1
\& RSA * d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length, int (*cb)());
.Ve
.PP
.Vb 1
\& int i2d_Netscape_RSA(RSA *a, unsigned char **pp, int (*cb)());
.Ve
.SH "DESCRIPTION"
.IX Header "DESCRIPTION"

Lines 1021-1027 Link Here

(-)crypto/openssl/apps/apps.c (-1 / +1 lines)
1021	goto error;	1021	goto error;
1022	}	1022	}
1023	}	1023	}
1024	p=(unsigned char *)buf->data;	1024	p=buf->data;
1025	rsa = d2i_RSA_NET(NULL,&p,(long)size,NULL,	1025	rsa = d2i_RSA_NET(NULL,&p,(long)size,NULL,
1026	(format == FORMAT_IISSGC ? 1 : 0));	1026	(format == FORMAT_IISSGC ? 1 : 0));
1027	if (rsa == NULL)	1027	if (rsa == NULL)




#ifndef OPENSSL_NO_RSA
	case EVP_PKEY_RSA:
		if ((ret->pkey.rsa=d2i_RSAPrivateKey(NULL,
			pp,length)) == NULL) /* TMP UGLY CAST */
			{
			ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
			goto err;

#ifndef OPENSSL_NO_DSA
	case EVP_PKEY_DSA:
		if ((ret->pkey.dsa=d2i_DSAPrivateKey(NULL,
			pp,length)) == NULL) /* TMP UGLY CAST */
			{
			ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
			goto err;

#ifndef OPENSSL_NO_EC
	case EVP_PKEY_EC:
		if ((ret->pkey.ec = d2i_ECPrivateKey(NULL, 
			pp, length)) == NULL)
			{
			ASN1err(ASN1_F_D2I_PRIVATEKEY, ERR_R_ASN1_LIB);
			goto err;




#ifndef OPENSSL_NO_RSA
	case EVP_PKEY_RSA:
		if ((ret->pkey.rsa=d2i_RSAPublicKey(NULL,
			pp,length)) == NULL) /* TMP UGLY CAST */
			{
			ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
			goto err;

#ifndef OPENSSL_NO_DSA
	case EVP_PKEY_DSA:
		if (!d2i_DSAPublicKey(&(ret->pkey.dsa),
			pp,length)) /* TMP UGLY CAST */
			{
			ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
			goto err;

#ifndef OPENSSL_NO_EC
	case EVP_PKEY_EC:
		if (!o2i_ECPublicKey(&(ret->pkey.ec),
				     pp, length))
			{
			ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
			goto err;

Lines 23-29 Link Here

(-)crypto/openssl/demos/eay/loadrsa.c (-1 / +1 lines)
23	{	23	{
24	RSA rsa,pub_rsa,*priv_rsa;	24	RSA rsa,pub_rsa,*priv_rsa;
25	int len;	25	int len;
26	unsigned char buf[1024],*p;	26	const unsigned char buf[1024],*p;
27		27
28	rsa=RSA_generate_key(512,RSA_F4,callback,(char *)stdout);	28	rsa=RSA_generate_key(512,RSA_F4,callback,(char *)stdout);

Return to bug 118902

Lines 142-148 Link Here

(-)secure/lib/libcrypto/man/d2i_RSAPublicKey.3 (-5 / +5 lines)
142	.Ve	142	.Ve
143	.PP	143	.PP
144	.Vb 1	144	.Vb 1
145	\& RSA * d2i_RSAPublicKey(RSA a, unsigned char pp, long length);	145	\& RSA * d2i_RSAPublicKey(RSA a, const unsigned char pp, long length);
146	.Ve	146	.Ve
147	.PP	147	.PP
148	.Vb 1	148	.Vb 1
Lines 150-156 Link Here
150	.Ve	150	.Ve
151	.PP	151	.PP
152	.Vb 1	152	.Vb 1
153	\& RSA * d2i_RSA_PUBKEY(RSA a, unsigned char pp, long length);	153	\& RSA * d2i_RSA_PUBKEY(RSA a, const unsigned char pp, long length);
154	.Ve	154	.Ve
155	.PP	155	.PP
156	.Vb 1	156	.Vb 1
Lines 158-164 Link Here
158	.Ve	158	.Ve
159	.PP	159	.PP
160	.Vb 1	160	.Vb 1
161	\& RSA * d2i_RSAPrivateKey(RSA a, unsigned char pp, long length);	161	\& RSA * d2i_RSAPrivateKey(RSA a, const unsigned char pp, long length);
162	.Ve	162	.Ve
163	.PP	163	.PP
164	.Vb 1	164	.Vb 1
Lines 166-176 Link Here
166	.Ve	166	.Ve
167	.PP	167	.PP
168	.Vb 1	168	.Vb 1
169	\& int i2d_Netscape_RSA(RSA a, unsigned char pp, int (cb)());	169	\& RSA * d2i_Netscape_RSA(RSA a, const unsigned char pp, long length, int (*cb)());
170	.Ve	170	.Ve
171	.PP	171	.PP
172	.Vb 1	172	.Vb 1
173	\& RSA * d2i_Netscape_RSA(RSA a, unsigned char pp, long length, int (*cb)());	173	\& int i2d_Netscape_RSA(RSA a, unsigned char pp, int (cb)());
174	.Ve	174	.Ve
175	.SH "DESCRIPTION"	175	.SH "DESCRIPTION"
176	.IX Header "DESCRIPTION"	176	.IX Header "DESCRIPTION"

Lines 94-100 Link Here

(-)crypto/openssl/crypto/asn1/d2i_pr.c (-3 / +3 lines)
94	#ifndef OPENSSL_NO_RSA	94	#ifndef OPENSSL_NO_RSA
95	case EVP_PKEY_RSA:	95	case EVP_PKEY_RSA:
96	if ((ret->pkey.rsa=d2i_RSAPrivateKey(NULL,	96	if ((ret->pkey.rsa=d2i_RSAPrivateKey(NULL,
97	(const unsigned char *)pp,length)) == NULL) / TMP UGLY CAST */	97	pp,length)) == NULL) /* TMP UGLY CAST */
98	{	98	{
99	ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);	99	ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
100	goto err;	100	goto err;
Lines 104-110 Link Here
104	#ifndef OPENSSL_NO_DSA	104	#ifndef OPENSSL_NO_DSA
105	case EVP_PKEY_DSA:	105	case EVP_PKEY_DSA:
106	if ((ret->pkey.dsa=d2i_DSAPrivateKey(NULL,	106	if ((ret->pkey.dsa=d2i_DSAPrivateKey(NULL,
107	(const unsigned char *)pp,length)) == NULL) / TMP UGLY CAST */	107	pp,length)) == NULL) /* TMP UGLY CAST */
108	{	108	{
109	ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);	109	ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
110	goto err;	110	goto err;
Lines 114-120 Link Here
114	#ifndef OPENSSL_NO_EC	114	#ifndef OPENSSL_NO_EC
115	case EVP_PKEY_EC:	115	case EVP_PKEY_EC:
116	if ((ret->pkey.ec = d2i_ECPrivateKey(NULL,	116	if ((ret->pkey.ec = d2i_ECPrivateKey(NULL,
117	(const unsigned char **)pp, length)) == NULL)	117	pp, length)) == NULL)
118	{	118	{
119	ASN1err(ASN1_F_D2I_PRIVATEKEY, ERR_R_ASN1_LIB);	119	ASN1err(ASN1_F_D2I_PRIVATEKEY, ERR_R_ASN1_LIB);
120	goto err;	120	goto err;

Lines 94-100 Link Here

(-)crypto/openssl/crypto/asn1/d2i_pu.c (-3 / +3 lines)
94	#ifndef OPENSSL_NO_RSA	94	#ifndef OPENSSL_NO_RSA
95	case EVP_PKEY_RSA:	95	case EVP_PKEY_RSA:
96	if ((ret->pkey.rsa=d2i_RSAPublicKey(NULL,	96	if ((ret->pkey.rsa=d2i_RSAPublicKey(NULL,
97	(const unsigned char *)pp,length)) == NULL) / TMP UGLY CAST */	97	pp,length)) == NULL) /* TMP UGLY CAST */
98	{	98	{
99	ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);	99	ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
100	goto err;	100	goto err;
Lines 104-110 Link Here
104	#ifndef OPENSSL_NO_DSA	104	#ifndef OPENSSL_NO_DSA
105	case EVP_PKEY_DSA:	105	case EVP_PKEY_DSA:
106	if (!d2i_DSAPublicKey(&(ret->pkey.dsa),	106	if (!d2i_DSAPublicKey(&(ret->pkey.dsa),
107	(const unsigned char *)pp,length)) / TMP UGLY CAST */	107	pp,length)) /* TMP UGLY CAST */
108	{	108	{
109	ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);	109	ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
110	goto err;	110	goto err;
Lines 114-120 Link Here
114	#ifndef OPENSSL_NO_EC	114	#ifndef OPENSSL_NO_EC
115	case EVP_PKEY_EC:	115	case EVP_PKEY_EC:
116	if (!o2i_ECPublicKey(&(ret->pkey.ec),	116	if (!o2i_ECPublicKey(&(ret->pkey.ec),
117	(const unsigned char **)pp, length))	117	pp, length))
118	{	118	{
119	ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);	119	ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
120	goto err;	120	goto err;