generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge in the latest fixes from 0.9.6a-beta3.

Browse Source 
These changes will be part of OpenSSL 0.9.6a beta3 [engine]
This commit is contained in:
Richard Levitte
2001-03-30 15:31:42 +00:00
parent 53195ba215
commit ac0d075faa
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES
View File

@@ -4,6 +4,12 @@
Changes between 0.9.6 and 0.9.6a [xx XXX 2001] Changes between 0.9.6 and 0.9.6a [xx XXX 2001]
*) Fix for asn1_GetSequence() for indefinite length constructed data.
If SEQUENCE is length is indefinite just set c->slen to the total
amount of data available.
[Steve Henson, reported by shige@FreeBSD.org]
[This change does not apply to 0.9.7.]
*) Change bctest to avoid here-documents inside command substitution *) Change bctest to avoid here-documents inside command substitution
(workaround for FreeBSD /bin/sh bug). (workaround for FreeBSD /bin/sh bug).
[Bodo Moeller] [Bodo Moeller]

5
apps/s_server.c
View File

@@ -1395,9 +1395,6 @@ static int www_body(char *hostname, int s, unsigned char *context)
switch (dot) switch (dot)
{ {
case 0:
dot = (e[0] == '/') ? 1 : 0;
break;
case 1: case 1:
dot = (e[0] == '.') ? 2 : 0; dot = (e[0] == '.') ? 2 : 0;
break; break;
@@ -1408,6 +1405,8 @@ static int www_body(char *hostname, int s, unsigned char *context)
dot = (e[0] == '/') ? -1 : 0; dot = (e[0] == '/') ? -1 : 0;
break; break;
} }
if (dot == 0)
dot = (e[0] == '/') ? 1 : 0;
} }
dot = (dot == 3) || (dot == -1); /* filename contains ".." component */ dot = (dot == 3) || (dot == -1); /* filename contains ".." component */

2
crypto/asn1/asn1_lib.c
View File

@@ -301,7 +301,7 @@ int asn1_GetSequence(ASN1_CTX *c, long *length)
return(0); return(0);
} }
if (c->inf == (1|V_ASN1_CONSTRUCTED)) if (c->inf == (1|V_ASN1_CONSTRUCTED))
c->slen= *length+ *(c->pp)-c->p; c->slen= *length;
c->eos=0; c->eos=0;
return(1); return(1);
} }