summaryrefslogtreecommitdiff
path: root/lib/libcrypto/ec
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2014-05-29 20:21:24 +0000
committerBob Beck <beck@cvs.openbsd.org>2014-05-29 20:21:24 +0000
commit4b83ed84c358f5a49df194b2f225f69533870f5c (patch)
tree197185e303204be261fd93b5d344721e33d08dc6 /lib/libcrypto/ec
parentb5a8f988f407de25c016d121edcfc3e2a5272bdc (diff)
Everything sane has stdio, and FILE *. we don't need ifdefs for this.
ok to firebomb from tedu@
Diffstat (limited to 'lib/libcrypto/ec')
-rw-r--r--lib/libcrypto/ec/ec.h4
-rw-r--r--lib/libcrypto/ec/eck_prn.c2
2 files changed, 0 insertions, 6 deletions
diff --git a/lib/libcrypto/ec/ec.h b/lib/libcrypto/ec/ec.h
index 86f8c6820d9..1e0b929304f 100644
--- a/lib/libcrypto/ec/ec.h
+++ b/lib/libcrypto/ec/ec.h
@@ -695,9 +695,7 @@ int i2d_ECPKParameters(const EC_GROUP *, unsigned char **out);
#ifndef OPENSSL_NO_BIO
int ECPKParameters_print(BIO *bp, const EC_GROUP *x, int off);
#endif
-#ifndef OPENSSL_NO_FP_API
int ECPKParameters_print_fp(FILE *fp, const EC_GROUP *x, int off);
-#endif
/********************************************************************/
@@ -930,7 +928,6 @@ int ECParameters_print(BIO *bp, const EC_KEY *key);
int EC_KEY_print(BIO *bp, const EC_KEY *key, int off);
#endif
-#ifndef OPENSSL_NO_FP_API
/** Prints out the ec parameters on human readable form.
* \param fp file descriptor to which the information is printed
* \param key EC_KEY object
@@ -946,7 +943,6 @@ int ECParameters_print_fp(FILE *fp, const EC_KEY *key);
*/
int EC_KEY_print_fp(FILE *fp, const EC_KEY *key, int off);
-#endif
#define ECParameters_dup(x) ASN1_dup_of(EC_KEY,i2d_ECParameters,d2i_ECParameters,x)
diff --git a/lib/libcrypto/ec/eck_prn.c b/lib/libcrypto/ec/eck_prn.c
index 86107d51424..3f2973e5b65 100644
--- a/lib/libcrypto/ec/eck_prn.c
+++ b/lib/libcrypto/ec/eck_prn.c
@@ -67,7 +67,6 @@
#include <openssl/ec.h>
#include <openssl/bn.h>
-#ifndef OPENSSL_NO_FP_API
int
ECPKParameters_print_fp(FILE * fp, const EC_GROUP * x, int off)
{
@@ -115,7 +114,6 @@ ECParameters_print_fp(FILE * fp, const EC_KEY * x)
BIO_free(b);
return (ret);
}
-#endif
int
EC_KEY_print(BIO * bp, const EC_KEY * x, int off)