aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf S. Engelschall <rse@openssl.org>1999-08-08 10:15:43 +0000
committerRalf S. Engelschall <rse@openssl.org>1999-08-08 10:15:43 +0000
commit9639515871c73722de3fff04d3c50d54aa6b1477 (patch)
treeaeedc8c1cc2f73cda0b329d5ecacf35daf374204
parent5a97a0b6e40d038ae62c11ed2981df2f6f868032 (diff)
downloadopenssl-9639515871c73722de3fff04d3c50d54aa6b1477.tar.gz
A few more ``#ifndef NO_FP_API / #endif'' pairs for consistency.
Hint from: Andrija Antonijevic <TheAntony2@bigfoot.com>
-rw-r--r--CHANGES3
-rw-r--r--crypto/pkcs12/p12_utl.c4
-rw-r--r--crypto/x509v3/v3_prn.c2
3 files changed, 9 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 6dd3eddee4..f298e40b2e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
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'
program.
[Steve Henson]
diff --git a/crypto/pkcs12/p12_utl.c b/crypto/pkcs12/p12_utl.c
index 8dccd9e97c..2adcbc95e1 100644
--- a/crypto/pkcs12/p12_utl.c
+++ b/crypto/pkcs12/p12_utl.c
@@ -96,19 +96,23 @@ int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12)
return ASN1_i2d_bio((int(*)())i2d_PKCS12, bp, (unsigned char *)p12);
}
+#ifndef NO_FP_API
int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12)
{
return ASN1_i2d_fp((int(*)())i2d_PKCS12, fp, (unsigned char *)p12);
}
+#endif
PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12)
{
return (PKCS12 *)ASN1_d2i_bio((char *(*)())PKCS12_new,
(char *(*)())d2i_PKCS12, bp, (unsigned char **)p12);
}
+#ifndef NO_FP_API
PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12)
{
return (PKCS12 *)ASN1_d2i_fp((char *(*)())PKCS12_new,
(char *(*)())d2i_PKCS12, fp, (unsigned char **)(p12));
}
+#endif
diff --git a/crypto/x509v3/v3_prn.c b/crypto/x509v3/v3_prn.c
index 74cad7d90b..dc20c6bdba 100644
--- a/crypto/x509v3/v3_prn.c
+++ b/crypto/x509v3/v3_prn.c
@@ -122,6 +122,7 @@ int X509V3_EXT_print(BIO *out, X509_EXTENSION *ext, int flag, int indent)
return ok;
}
+#ifndef NO_FP_API
int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
{
BIO *bio_tmp;
@@ -131,3 +132,4 @@ int X509V3_EXT_print_fp(FILE *fp, X509_EXTENSION *ext, int flag, int indent)
BIO_free(bio_tmp);
return ret;
}
+#endif