projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from 0.9.7-stable.
[openssl.git]
/
crypto
/
pem
/
pem_lib.c
diff --git
a/crypto/pem/pem_lib.c
b/crypto/pem/pem_lib.c
index fbc94d6a80ecdae2fea39619ce9d7f01848fd9ec..8e213c11c415fffd7e36cd6ec71db2069b5ad284 100644
(file)
--- a/
crypto/pem/pem_lib.c
+++ b/
crypto/pem/pem_lib.c
@@
-306,7
+306,7
@@
int PEM_ASN1_write_bio(int (*i2d)(), const char *name, BIO *bp, char *x,
goto err;
}
/* dzise + 8 bytes are needed */
goto err;
}
/* dzise + 8 bytes are needed */
- /
/ actually it needs the cipher block size extra...
+ /
* actually it needs the cipher block size extra... */
data=(unsigned char *)OPENSSL_malloc((unsigned int)dsize+20);
if (data == NULL)
{
data=(unsigned char *)OPENSSL_malloc((unsigned int)dsize+20);
if (data == NULL)
{