projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update from HEAD.
[oweals/openssl.git]
/
crypto
/
asn1
/
a_i2d_fp.c
diff --git
a/crypto/asn1/a_i2d_fp.c
b/crypto/asn1/a_i2d_fp.c
index 7de7b45e706d4dc11584112d129f4f26c9d6676a..a3ad76d35687bdef74bee7f538645ac2f29b74ab 100644
(file)
--- a/
crypto/asn1/a_i2d_fp.c
+++ b/
crypto/asn1/a_i2d_fp.c
@@
-63,8
+63,8
@@
#ifndef NO_OLD_ASN1
#ifndef NO_OLD_ASN1
-#ifndef NO_FP_API
-int ASN1_i2d_fp(i
nt (*i2d)(), FILE *out, unsigned char
*x)
+#ifndef
OPENSSL_
NO_FP_API
+int ASN1_i2d_fp(i
2d_of_void *i2d, FILE *out, void
*x)
{
BIO *b;
int ret;
{
BIO *b;
int ret;
@@
-81,7
+81,7
@@
int ASN1_i2d_fp(int (*i2d)(), FILE *out, unsigned char *x)
}
#endif
}
#endif
-int ASN1_i2d_bio(i
nt (*i2d)()
, BIO *out, unsigned char *x)
+int ASN1_i2d_bio(i
2d_of_void *i2d
, BIO *out, unsigned char *x)
{
char *b;
unsigned char *p;
{
char *b;
unsigned char *p;
@@
-116,7
+116,7
@@
int ASN1_i2d_bio(int (*i2d)(), BIO *out, unsigned char *x)
#endif
#endif
-#ifndef NO_FP_API
+#ifndef
OPENSSL_
NO_FP_API
int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x)
{
BIO *b;
int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x)
{
BIO *b;
@@
-124,7
+124,7
@@
int ASN1_item_i2d_fp(const ASN1_ITEM *it, FILE *out, void *x)
if ((b=BIO_new(BIO_s_file())) == NULL)
{
if ((b=BIO_new(BIO_s_file())) == NULL)
{
- ASN1err(ASN1_F_ASN1_I2D_FP,ERR_R_BUF_LIB);
+ ASN1err(ASN1_F_ASN1_I
TEM_I
2D_FP,ERR_R_BUF_LIB);
return(0);
}
BIO_set_fp(b,out,BIO_NOCLOSE);
return(0);
}
BIO_set_fp(b,out,BIO_NOCLOSE);
@@
-142,7
+142,7
@@
int ASN1_item_i2d_bio(const ASN1_ITEM *it, BIO *out, void *x)
n = ASN1_item_i2d(x, &b, it);
if (b == NULL)
{
n = ASN1_item_i2d(x, &b, it);
if (b == NULL)
{
- ASN1err(ASN1_F_ASN1_I2D_BIO,ERR_R_MALLOC_FAILURE);
+ ASN1err(ASN1_F_ASN1_I
TEM_I
2D_BIO,ERR_R_MALLOC_FAILURE);
return(0);
}
return(0);
}