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/ts | |
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/ts')
-rw-r--r-- | src/lib/libcrypto/ts/ts_asn1.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/libcrypto/ts/ts_asn1.c b/src/lib/libcrypto/ts/ts_asn1.c index 9e16b01f93..b5dc453510 100644 --- a/src/lib/libcrypto/ts/ts_asn1.c +++ b/src/lib/libcrypto/ts/ts_asn1.c | |||
@@ -82,7 +82,6 @@ i2d_TS_MSG_IMPRINT_bio(BIO *bp, TS_MSG_IMPRINT *a) | |||
82 | } | 82 | } |
83 | #endif | 83 | #endif |
84 | 84 | ||
85 | #ifndef OPENSSL_NO_FP_API | ||
86 | TS_MSG_IMPRINT * | 85 | TS_MSG_IMPRINT * |
87 | d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a) | 86 | d2i_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT **a) |
88 | { | 87 | { |
@@ -95,7 +94,6 @@ i2d_TS_MSG_IMPRINT_fp(FILE *fp, TS_MSG_IMPRINT *a) | |||
95 | { | 94 | { |
96 | return ASN1_i2d_fp_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, fp, a); | 95 | return ASN1_i2d_fp_of_const(TS_MSG_IMPRINT, i2d_TS_MSG_IMPRINT, fp, a); |
97 | } | 96 | } |
98 | #endif | ||
99 | 97 | ||
100 | ASN1_SEQUENCE(TS_REQ) = { | 98 | ASN1_SEQUENCE(TS_REQ) = { |
101 | ASN1_SIMPLE(TS_REQ, version, ASN1_INTEGER), | 99 | ASN1_SIMPLE(TS_REQ, version, ASN1_INTEGER), |
@@ -123,7 +121,6 @@ i2d_TS_REQ_bio(BIO *bp, TS_REQ *a) | |||
123 | } | 121 | } |
124 | #endif | 122 | #endif |
125 | 123 | ||
126 | #ifndef OPENSSL_NO_FP_API | ||
127 | TS_REQ * | 124 | TS_REQ * |
128 | d2i_TS_REQ_fp(FILE *fp, TS_REQ **a) | 125 | d2i_TS_REQ_fp(FILE *fp, TS_REQ **a) |
129 | { | 126 | { |
@@ -135,7 +132,6 @@ i2d_TS_REQ_fp(FILE *fp, TS_REQ *a) | |||
135 | { | 132 | { |
136 | return ASN1_i2d_fp_of_const(TS_REQ, i2d_TS_REQ, fp, a); | 133 | return ASN1_i2d_fp_of_const(TS_REQ, i2d_TS_REQ, fp, a); |
137 | } | 134 | } |
138 | #endif | ||
139 | 135 | ||
140 | ASN1_SEQUENCE(TS_ACCURACY) = { | 136 | ASN1_SEQUENCE(TS_ACCURACY) = { |
141 | ASN1_OPT(TS_ACCURACY, seconds, ASN1_INTEGER), | 137 | ASN1_OPT(TS_ACCURACY, seconds, ASN1_INTEGER), |
@@ -177,7 +173,6 @@ i2d_TS_TST_INFO_bio(BIO *bp, TS_TST_INFO *a) | |||
177 | } | 173 | } |
178 | #endif | 174 | #endif |
179 | 175 | ||
180 | #ifndef OPENSSL_NO_FP_API | ||
181 | TS_TST_INFO * | 176 | TS_TST_INFO * |
182 | d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a) | 177 | d2i_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO **a) |
183 | { | 178 | { |
@@ -190,7 +185,6 @@ i2d_TS_TST_INFO_fp(FILE *fp, TS_TST_INFO *a) | |||
190 | { | 185 | { |
191 | return ASN1_i2d_fp_of_const(TS_TST_INFO, i2d_TS_TST_INFO, fp, a); | 186 | return ASN1_i2d_fp_of_const(TS_TST_INFO, i2d_TS_TST_INFO, fp, a); |
192 | } | 187 | } |
193 | #endif | ||
194 | 188 | ||
195 | ASN1_SEQUENCE(TS_STATUS_INFO) = { | 189 | ASN1_SEQUENCE(TS_STATUS_INFO) = { |
196 | ASN1_SIMPLE(TS_STATUS_INFO, status, ASN1_INTEGER), | 190 | ASN1_SIMPLE(TS_STATUS_INFO, status, ASN1_INTEGER), |
@@ -268,7 +262,6 @@ i2d_TS_RESP_bio(BIO *bp, TS_RESP *a) | |||
268 | } | 262 | } |
269 | #endif | 263 | #endif |
270 | 264 | ||
271 | #ifndef OPENSSL_NO_FP_API | ||
272 | TS_RESP * | 265 | TS_RESP * |
273 | d2i_TS_RESP_fp(FILE *fp, TS_RESP **a) | 266 | d2i_TS_RESP_fp(FILE *fp, TS_RESP **a) |
274 | { | 267 | { |
@@ -280,7 +273,6 @@ i2d_TS_RESP_fp(FILE *fp, TS_RESP *a) | |||
280 | { | 273 | { |
281 | return ASN1_i2d_fp_of_const(TS_RESP, i2d_TS_RESP, fp, a); | 274 | return ASN1_i2d_fp_of_const(TS_RESP, i2d_TS_RESP, fp, a); |
282 | } | 275 | } |
283 | #endif | ||
284 | 276 | ||
285 | ASN1_SEQUENCE(ESS_ISSUER_SERIAL) = { | 277 | ASN1_SEQUENCE(ESS_ISSUER_SERIAL) = { |
286 | ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME), | 278 | ASN1_SEQUENCE_OF(ESS_ISSUER_SERIAL, issuer, GENERAL_NAME), |