diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2016-09-22 13:05:59 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2016-09-22 13:05:59 +0000 |
| commit | 2c14c598c3061ac2533f997352aa06a2266f44d9 (patch) | |
| tree | 470894a14935f308eeac93c6cbf6cf25632e1cb1 /crypto/pkcs12/p12_utl.c | |
| parent | 47b11f985b9e0ff561a67e19674de6fbcf79281d (diff) | |
| download | src-2c14c598c3061ac2533f997352aa06a2266f44d9.tar.gz src-2c14c598c3061ac2533f997352aa06a2266f44d9.zip | |
Import OpenSSL 1.0.1u.vendor/openssl/1.0.1uvendor/openssl-1.0.1
Notes
Notes:
svn path=/vendor-crypto/openssl/dist-1.0.1/; revision=306191
svn path=/vendor-crypto/openssl/1.0.1u/; revision=306192; tag=vendor/openssl/1.0.1u
Diffstat (limited to 'crypto/pkcs12/p12_utl.c')
| -rw-r--r-- | crypto/pkcs12/p12_utl.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c index a0b992eab66c..e466f762ffda 100644 --- a/crypto/pkcs12/p12_utl.c +++ b/crypto/pkcs12/p12_utl.c @@ -91,6 +91,10 @@ char *OPENSSL_uni2asc(unsigned char *uni, int unilen) { int asclen, i; char *asctmp; + + /* string must contain an even number of bytes */ + if (unilen & 1) + return NULL; asclen = unilen / 2; /* If no terminating zero allow for one */ if (!unilen || uni[unilen - 1]) |