Attachment 83212 Details for Bug 118902 – _d2i_RSAPublicKey.3.diff

[patch] _d2i_RSAPublicKey.3.diff

_d2i_RSAPublicKey.3.diff (text/plain), 3.75 KB, created by Pietro Cerutti on 2007-12-20 20:40:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pietro Cerutti

Created: 2007-12-20 20:40:00 UTC

Size: 3.75 KB

patch

obsolete

>--- secure/lib/libcrypto/man/d2i_RSAPublicKey.3.orig	2007-12-20 21:07:05.000000000 +0100
>+++ secure/lib/libcrypto/man/d2i_RSAPublicKey.3	2007-12-20 21:07:43.000000000 +0100
>@@ -142,7 +142,7 @@
> .Ve
> .PP
> .Vb 1
>-\& RSA * d2i_RSAPublicKey(RSA **a, unsigned char **pp, long length);
>+\& RSA * d2i_RSAPublicKey(RSA **a, const unsigned char **pp, long length);
> .Ve
> .PP
> .Vb 1
>@@ -150,7 +150,7 @@
> .Ve
> .PP
> .Vb 1
>-\& RSA * d2i_RSA_PUBKEY(RSA **a, unsigned char **pp, long length);
>+\& RSA * d2i_RSA_PUBKEY(RSA **a, const unsigned char **pp, long length);
> .Ve
> .PP
> .Vb 1
>@@ -158,7 +158,7 @@
> .Ve
> .PP
> .Vb 1
>-\& RSA * d2i_RSAPrivateKey(RSA **a, unsigned char **pp, long length);
>+\& RSA * d2i_RSAPrivateKey(RSA **a, const unsigned char **pp, long length);
> .Ve
> .PP
> .Vb 1
>@@ -166,11 +166,11 @@
> .Ve
> .PP
> .Vb 1
>-\& int i2d_Netscape_RSA(RSA *a, unsigned char **pp, int (*cb)());
>+\& RSA * d2i_Netscape_RSA(RSA **a, const unsigned char **pp, long length, int (*cb)());
> .Ve
> .PP
> .Vb 1
>-\& RSA * d2i_Netscape_RSA(RSA **a, unsigned char **pp, long length, int (*cb)());
>+\& int i2d_Netscape_RSA(RSA *a, unsigned char **pp, int (*cb)());
> .Ve
> .SH "DESCRIPTION"
> .IX Header "DESCRIPTION"
>--- crypto/openssl/apps/apps.c.orig	2007-12-20 21:16:59.000000000 +0100
>+++ crypto/openssl/apps/apps.c	2007-12-20 21:17:33.000000000 +0100
>@@ -1021,7 +1021,7 @@
> 				goto error;
> 			}
> 		}
>-	p=(unsigned char *)buf->data;
>+	p=buf->data;
> 	rsa = d2i_RSA_NET(NULL,&p,(long)size,NULL,
> 		(format == FORMAT_IISSGC ? 1 : 0));
> 	if (rsa == NULL)
>--- crypto/openssl/crypto/asn1/d2i_pr.c.orig	2007-12-20 21:20:02.000000000 +0100
>+++ crypto/openssl/crypto/asn1/d2i_pr.c	2007-12-20 21:21:26.000000000 +0100
>@@ -94,7 +94,7 @@
> #ifndef OPENSSL_NO_RSA
> 	case EVP_PKEY_RSA:
> 		if ((ret->pkey.rsa=d2i_RSAPrivateKey(NULL,
>-			(const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
>+			pp,length)) == NULL) /* TMP UGLY CAST */
> 			{
> 			ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
> 			goto err;
>@@ -104,7 +104,7 @@
> #ifndef OPENSSL_NO_DSA
> 	case EVP_PKEY_DSA:
> 		if ((ret->pkey.dsa=d2i_DSAPrivateKey(NULL,
>-			(const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
>+			pp,length)) == NULL) /* TMP UGLY CAST */
> 			{
> 			ASN1err(ASN1_F_D2I_PRIVATEKEY,ERR_R_ASN1_LIB);
> 			goto err;
>@@ -114,7 +114,7 @@
> #ifndef OPENSSL_NO_EC
> 	case EVP_PKEY_EC:
> 		if ((ret->pkey.ec = d2i_ECPrivateKey(NULL, 
>-			(const unsigned char **)pp, length)) == NULL)
>+			pp, length)) == NULL)
> 			{
> 			ASN1err(ASN1_F_D2I_PRIVATEKEY, ERR_R_ASN1_LIB);
> 			goto err;
>--- crypto/openssl/crypto/asn1/d2i_pu.c.orig	2007-12-20 21:22:43.000000000 +0100
>+++ crypto/openssl/crypto/asn1/d2i_pu.c	2007-12-20 21:23:07.000000000 +0100
>@@ -94,7 +94,7 @@
> #ifndef OPENSSL_NO_RSA
> 	case EVP_PKEY_RSA:
> 		if ((ret->pkey.rsa=d2i_RSAPublicKey(NULL,
>-			(const unsigned char **)pp,length)) == NULL) /* TMP UGLY CAST */
>+			pp,length)) == NULL) /* TMP UGLY CAST */
> 			{
> 			ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
> 			goto err;
>@@ -104,7 +104,7 @@
> #ifndef OPENSSL_NO_DSA
> 	case EVP_PKEY_DSA:
> 		if (!d2i_DSAPublicKey(&(ret->pkey.dsa),
>-			(const unsigned char **)pp,length)) /* TMP UGLY CAST */
>+			pp,length)) /* TMP UGLY CAST */
> 			{
> 			ASN1err(ASN1_F_D2I_PUBLICKEY,ERR_R_ASN1_LIB);
> 			goto err;
>@@ -114,7 +114,7 @@
> #ifndef OPENSSL_NO_EC
> 	case EVP_PKEY_EC:
> 		if (!o2i_ECPublicKey(&(ret->pkey.ec),
>-				     (const unsigned char **)pp, length))
>+				     pp, length))
> 			{
> 			ASN1err(ASN1_F_D2I_PUBLICKEY, ERR_R_ASN1_LIB);
> 			goto err;
>--- crypto/openssl/demos/eay/loadrsa.c.orig	2007-12-20 21:28:15.000000000 +0100
>+++ crypto/openssl/demos/eay/loadrsa.c	2007-12-20 21:28:26.000000000 +0100
>@@ -23,7 +23,7 @@
> 	{
> 	RSA *rsa,*pub_rsa,*priv_rsa;
> 	int len;
>-	unsigned char buf[1024],*p;
>+	const unsigned char buf[1024],*p;
> 
> 	rsa=RSA_generate_key(512,RSA_F4,callback,(char *)stdout);

Actions: View | Diff

Attachments on bug 118902: 83212