diff options
| author | beck <> | 2014-05-29 20:21:23 +0000 |
|---|---|---|
| committer | beck <> | 2014-05-29 20:21:23 +0000 |
| commit | d205a2aecb99564cccfbea61c39ebe3b0ddd7fb7 (patch) | |
| tree | 0085ebdac711a18932d8d8d531d36f82fce2c8bc /src/lib/libcrypto/pkcs12 | |
| parent | 6f22007e67d4c2d77b9caea83bc05974d11dbb0d (diff) | |
| download | openbsd-d205a2aecb99564cccfbea61c39ebe3b0ddd7fb7.tar.gz openbsd-d205a2aecb99564cccfbea61c39ebe3b0ddd7fb7.tar.bz2 openbsd-d205a2aecb99564cccfbea61c39ebe3b0ddd7fb7.zip | |
Everything sane has stdio, and FILE *. we don't need ifdefs for this.
ok to firebomb from tedu@
Diffstat (limited to 'src/lib/libcrypto/pkcs12')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/p12_utl.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs12/p12_utl.c b/src/lib/libcrypto/pkcs12/p12_utl.c index 9c58036169..ec3dcb84fd 100644 --- a/src/lib/libcrypto/pkcs12/p12_utl.c +++ b/src/lib/libcrypto/pkcs12/p12_utl.c | |||
| @@ -100,23 +100,19 @@ int i2d_PKCS12_bio(BIO *bp, PKCS12 *p12) | |||
| 100 | return ASN1_item_i2d_bio(ASN1_ITEM_rptr(PKCS12), bp, p12); | 100 | return ASN1_item_i2d_bio(ASN1_ITEM_rptr(PKCS12), bp, p12); |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | #ifndef OPENSSL_NO_FP_API | ||
| 104 | int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12) | 103 | int i2d_PKCS12_fp(FILE *fp, PKCS12 *p12) |
| 105 | { | 104 | { |
| 106 | return ASN1_item_i2d_fp(ASN1_ITEM_rptr(PKCS12), fp, p12); | 105 | return ASN1_item_i2d_fp(ASN1_ITEM_rptr(PKCS12), fp, p12); |
| 107 | } | 106 | } |
| 108 | #endif | ||
| 109 | 107 | ||
| 110 | PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12) | 108 | PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12) |
| 111 | { | 109 | { |
| 112 | return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS12), bp, p12); | 110 | return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS12), bp, p12); |
| 113 | } | 111 | } |
| 114 | #ifndef OPENSSL_NO_FP_API | ||
| 115 | PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12) | 112 | PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12) |
| 116 | { | 113 | { |
| 117 | return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS12), fp, p12); | 114 | return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS12), fp, p12); |
| 118 | } | 115 | } |
| 119 | #endif | ||
| 120 | 116 | ||
| 121 | PKCS12_SAFEBAG *PKCS12_x5092certbag(X509 *x509) | 117 | PKCS12_SAFEBAG *PKCS12_x5092certbag(X509 *x509) |
| 122 | { | 118 | { |