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

Fix uni2asc() so it can properly convert zero length

Browse Source 
unicode strings. Certain PKCS#12 files contain these
in BMPStrings and it used to crash on them.
This commit is contained in:
Dr. Stephen Henson
2001-01-10 01:14:23 +00:00
parent 799751bcff
commit 5860ecb8ec
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -4,6 +4,10 @@
Changes between 0.9.6 and 0.9.6a [xx XXX 2000] Changes between 0.9.6 and 0.9.6a [xx XXX 2000]
*) Fix to uni2asc() to cope with zero length Unicode strings.
These are present in some PKCS#12 files.
[Steve Henson]
*) Increase s2->wbuf allocation by one byte in ssl2_new (ssl/s2_lib.c). *) Increase s2->wbuf allocation by one byte in ssl2_new (ssl/s2_lib.c).
Otherwise do_ssl_write (ssl/s2_pkt.c) will write beyond buffer limits Otherwise do_ssl_write (ssl/s2_pkt.c) will write beyond buffer limits
when writing a 32767 byte record. when writing a 32767 byte record.

2
crypto/pkcs12/p12_utl.c
View File

@@ -83,7 +83,7 @@ char *uni2asc (unsigned char *uni, int unilen)
char *asctmp; char *asctmp;
asclen = unilen / 2; asclen = unilen / 2;
/* If no terminating zero allow for one */ /* If no terminating zero allow for one */
if (uni[unilen - 1]) asclen++; if (!unilen || uni[unilen - 1]) asclen++;
uni++; uni++;
if (!(asctmp = OPENSSL_malloc (asclen))) return NULL; if (!(asctmp = OPENSSL_malloc (asclen))) return NULL;
for (i = 0; i < unilen; i+=2) asctmp[i>>1] = uni[i]; for (i = 0; i < unilen; i+=2) asctmp[i>>1] = uni[i];