projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
indent has problems with comments that are on the right hand side of a line.
[oweals/openssl.git]
/
crypto
/
pkcs12
/
p12_kiss.c
diff --git
a/crypto/pkcs12/p12_kiss.c
b/crypto/pkcs12/p12_kiss.c
index 292cc3ed4a27f2e076923a84279d4355669aac43..c9b7ab61d1bd93b8216332ce270f197ce1b5094a 100644
(file)
--- a/
crypto/pkcs12/p12_kiss.c
+++ b/
crypto/pkcs12/p12_kiss.c
@@
-167,7
+167,7
@@
int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
if (cert && *cert)
X509_free(*cert);
if (x)
if (cert && *cert)
X509_free(*cert);
if (x)
- X509_free(
*cert
);
+ X509_free(
x
);
if (ocerts)
sk_X509_pop_free(ocerts, X509_free);
return 0;
if (ocerts)
sk_X509_pop_free(ocerts, X509_free);
return 0;
@@
-269,7
+269,7
@@
static int parse_bag(PKCS12_SAFEBAG *bag, const char *pass, int passlen,
int len, r;
unsigned char *data;
len = ASN1_STRING_to_UTF8(&data, fname);
int len, r;
unsigned char *data;
len = ASN1_STRING_to_UTF8(&data, fname);
- if(len > 0) {
+ if(len >
=
0) {
r = X509_alias_set1(x509, data, len);
OPENSSL_free(data);
if (!r)
r = X509_alias_set1(x509, data, len);
OPENSSL_free(data);
if (!r)