提交 96395158 编写于 作者: R Ralf S. Engelschall

A few more ``#ifndef NO_FP_API / #endif'' pairs for consistency.

Hint from: Andrija Antonijevic <TheAntony2@bigfoot.com>
上级 5a97a0b6
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
Changes between 0.9.3a and 0.9.4 [xx Aug 1999] Changes between 0.9.3a and 0.9.4 [xx Aug 1999]
*) A few more ``#ifndef NO_FP_API / #endif'' pairs for consistency.
[Andrija Antonijevic <TheAntony2@bigfoot.com>]
*) Fix -startdate and -enddate (which was missing) arguments to 'ca' *) Fix -startdate and -enddate (which was missing) arguments to 'ca'
program. program.
[Steve Henson] [Steve Henson]
......
...@@ -96,19 +96,23 @@ int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12) ...@@ -96,19 +96,23 @@ int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
return ASN1_i2d_bio((int(*)())i2d_PKCS12, bp, (unsigned char *)p12); return ASN1_i2d_bio((int(*)())i2d_PKCS12, bp, (unsigned char *)p12);
} }
#ifndef NO_FP_API
int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12) int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
{ {
return ASN1_i2d_fp((int(*)())i2d_PKCS12, fp, (unsigned char *)p12); return ASN1_i2d_fp((int(*)())i2d_PKCS12, fp, (unsigned char *)p12);
} }
#endif
PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12) PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
{ {
return (PKCS12 *)ASN1_d2i_bio((char *(*)())PKCS12_new, return (PKCS12 *)ASN1_d2i_bio((char *(*)())PKCS12_new,
(char *(*)())d2i_PKCS12, bp, (unsigned char **)p12); (char *(*)())d2i_PKCS12, bp, (unsigned char **)p12);
} }
#ifndef NO_FP_API
PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12) PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
{ {
return (PKCS12 *)ASN1_d2i_fp((char *(*)())PKCS12_new, return (PKCS12 *)ASN1_d2i_fp((char *(*)())PKCS12_new,
(char *(*)())d2i_PKCS12, fp, (unsigned char **)(p12)); (char *(*)())d2i_PKCS12, fp, (unsigned char **)(p12));
} }
#endif
...@@ -122,6 +122,7 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent) ...@@ -122,6 +122,7 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent)
return ok; return ok;
} }
#ifndef NO_FP_API
int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent) int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
{ {
BIO *bio_tmp; BIO *bio_tmp;
...@@ -131,3 +132,4 @@ int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent) ...@@ -131,3 +132,4 @@ int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
BIO_free(bio_tmp); BIO_free(bio_tmp);
return ret; return ret;
} }
#endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册