aboutsummaryrefslogtreecommitdiff
path: root/crypto/pkcs12
diff options
context:
space:
mode:
authorDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2018-04-26 13:57:14 +0200
committerDr. Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>2018-04-26 21:34:46 +0200
commit32c6985349ba134761f75a3f61814234d096a1df (patch)
tree2878866f07d989e8667f7e57486cfb97b078dd3f /crypto/pkcs12
parent6fb7b08987b57a3a90d426fcad6ca24e6a11c705 (diff)
downloadopenssl-32c6985349ba134761f75a3f61814234d096a1df.zip
openssl-32c6985349ba134761f75a3f61814234d096a1df.tar.gz
openssl-32c6985349ba134761f75a3f61814234d096a1df.tar.bz2
Fix mixed indentation (and other whitespace issues)
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/6094)
Diffstat (limited to 'crypto/pkcs12')
-rw-r--r--crypto/pkcs12/p12_utl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index df5901a..7a8023b 100644
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -101,10 +101,10 @@ unsigned char *OPENSSL_utf82uni(const char *asc, int asclen,
* decoding failure...
*/
if (j < 0)
- return OPENSSL_asc2uni(asc, asclen, uni, unilen);
+ return OPENSSL_asc2uni(asc, asclen, uni, unilen);
if (utf32chr > 0x10FFFF) /* UTF-16 cap */
- return NULL;
+ return NULL;
if (utf32chr >= 0x10000) /* pair of UTF-16 characters */
ulen += 2*2;