From: [EMAIL PROTECTED]
Since this change, it seems like the pkcs7 test fails:
[levitte@levitte openssl-0.9.6-stable]$ (cd test/; sh ./tpkcs7)
testing pkcs7 conversions
p -> d
unable to load PKCS7 object
10638:error:0D091008:asn1 encoding routines:d2i_PKCS7:asn1 length
mismatch:p7_lib.c:323:address=135518848 offset=19
10638:error:0906700D:PEM routines:PEM_ASN1_read_bio:ASN1 lib:pem_lib.c:290:
p -> p
unable to load PKCS7 object
10639:error:0D091008:asn1 encoding routines:d2i_PKCS7:asn1 length
mismatch:p7_lib.c:323:address=135518848 offset=19
10639:error:0906700D:PEM routines:PEM_ASN1_read_bio:ASN1 lib:pem_lib.c:290:
d -> d
unable to load PKCS7 object
10640:error:0D06B078:asn1 encoding routines:ASN1_get_object:header too
long:asn1_lib.c:139:
p -> d
unable to load PKCS7 object
10641:error:0906D06C:PEM routines:PEM_read_bio:no start line:pem_lib.c:662:Expecting:
PKCS7
d -> p
unable to load PKCS7 object
10642:error:0D06B078:asn1 encoding routines:ASN1_get_object:header too
long:asn1_lib.c:139:
p -> p
unable to load PKCS7 object
10643:error:0906D06C:PEM routines:PEM_read_bio:no start line:pem_lib.c:662:Expecting:
PKCS7
cmp: EOF on f.p
If I roll back that change, the test doesn't fail. This means that
either your fix is wrong, or we need a new testp7.pem...
steve> steve 22-Mar-2001 14:49:17
steve>
steve> Modified: . Tag: OpenSSL_0_9_6-stable CHANGES
steve> crypto/asn1 Tag: OpenSSL_0_9_6-stable p7_lib.c
steve> Log:
steve> Fix bug in PKCS#7 decode routines when indefinite length
steve> encoding is used inside definite length encoding.
steve>
steve> Revision Changes Path
steve> No revision
steve> No revision
steve> 1.618.2.55 +4 -0 openssl/CHANGES
steve>
steve> Index: CHANGES
steve> ===================================================================
steve> RCS file: /e/openssl/cvs/openssl/CHANGES,v
steve> retrieving revision 1.618.2.54
steve> retrieving revision 1.618.2.55
steve> diff -u -r1.618.2.54 -r1.618.2.55
steve> --- CHANGES 2001/03/22 10:59:18 1.618.2.54
steve> +++ CHANGES 2001/03/22 13:49:05 1.618.2.55
steve> @@ -4,6 +4,10 @@
steve>
steve> Changes between 0.9.6 and 0.9.6a [xx XXX 2001]
steve>
steve> + *) Fix PKCS#7 decode routines so they correctly update the length
steve> + after reading an EOC for the EXPLICIT tag.
steve> + [Steve Henson]
steve> +
steve> *) Fix bug in PKCS#12 key generation routines. This was triggered
steve> if a 3DES key was generated with a 0 initial byte. Include
steve> PKCS12_BROKEN_KEYGEN compilation option to retain the old
steve>
steve>
steve> No revision
steve> No revision
steve> 1.13.2.1 +2 -0 openssl/crypto/asn1/Attic/p7_lib.c
steve>
steve> Index: p7_lib.c
steve> ===================================================================
steve> RCS file: /e/openssl/cvs/openssl/crypto/asn1/Attic/p7_lib.c,v
steve> retrieving revision 1.13
steve> retrieving revision 1.13.2.1
steve> diff -u -r1.13 -r1.13.2.1
steve> --- p7_lib.c 2000/08/22 22:20:23 1.13
steve> +++ p7_lib.c 2001/03/22 13:49:15 1.13.2.1
steve> @@ -307,6 +307,7 @@
steve> }
steve> if (Tinf == (1|V_ASN1_CONSTRUCTED))
steve> {
steve> + c.q=c.p;
steve> if (!ASN1_check_infinite_end(&c.p,c.slen))
steve> {
steve> c.error=ERR_R_MISSING_ASN1_EOS;
steve> @@ -314,6 +315,7 @@
steve> goto err;
steve> }
steve> }
steve> + c.slen-=(c.p-c.q);
steve> }
steve> else
steve> ret->detached=1;
--
Richard Levitte \ Spannvägen 38, II \ [EMAIL PROTECTED]
Chairman@Stacken \ S-168 35 BROMMA \ T: +46-8-26 52 47
Redakteur@Stacken \ SWEDEN \ or +46-709-50 36 10
Procurator Odiosus Ex Infernis -- [EMAIL PROTECTED]
Member of the OpenSSL development team: http://www.openssl.org/
Software Engineer, Celo Communications: http://www.celocom.com/
Unsolicited commercial email is subject to an archival fee of $400.
See <http://www.stacken.kth.se/~levitte/mail/> for more info.
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
Re: cvs commit: openssl/crypto/asn1 p7_lib.c
Richard Levitte - VMS Whacker Thu, 22 Mar 2001 09:53:02 -0800
- Re: cvs commit: openssl/crypto/asn1 p7_lib.c Richard Levitte - VMS Whacker
- Re: cvs commit: openssl/crypto/asn1 p7_... Dr S N Henson
