From c7d4b57f0a9ef81bf8665e28189bba049f2616c0 Mon Sep 17 00:00:00 2001 From: beck Date: Fri, 16 Oct 2015 12:41:29 +0000 Subject: [PATCH] actually include the prerequisite dependency for BIO instead of doing nastyness --- lib/libcrypto/bn/bn.h | 7 ++----- lib/libssl/src/crypto/bn/bn.h | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/lib/libcrypto/bn/bn.h b/lib/libcrypto/bn/bn.h index d93c9fc0593..33c6162874a 100644 --- a/lib/libcrypto/bn/bn.h +++ b/lib/libcrypto/bn/bn.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn.h,v 1.26 2015/02/07 13:19:15 doug Exp $ */ +/* $OpenBSD: bn.h,v 1.27 2015/10/16 12:41:29 beck Exp $ */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -132,6 +132,7 @@ #include #include +#include #ifdef __cplusplus extern "C" { @@ -433,11 +434,7 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int BN_mask_bits(BIGNUM *a, int n); int BN_print_fp(FILE *fp, const BIGNUM *a); -#ifdef HEADER_BIO_H int BN_print(BIO *fp, const BIGNUM *a); -#else -int BN_print(void *fp, const BIGNUM *a); -#endif int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx); int BN_rshift(BIGNUM *r, const BIGNUM *a, int n); int BN_rshift1(BIGNUM *r, const BIGNUM *a); diff --git a/lib/libssl/src/crypto/bn/bn.h b/lib/libssl/src/crypto/bn/bn.h index d93c9fc0593..33c6162874a 100644 --- a/lib/libssl/src/crypto/bn/bn.h +++ b/lib/libssl/src/crypto/bn/bn.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bn.h,v 1.26 2015/02/07 13:19:15 doug Exp $ */ +/* $OpenBSD: bn.h,v 1.27 2015/10/16 12:41:29 beck Exp $ */ /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -132,6 +132,7 @@ #include #include +#include #ifdef __cplusplus extern "C" { @@ -433,11 +434,7 @@ int BN_mod_exp_simple(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, int BN_mask_bits(BIGNUM *a, int n); int BN_print_fp(FILE *fp, const BIGNUM *a); -#ifdef HEADER_BIO_H int BN_print(BIO *fp, const BIGNUM *a); -#else -int BN_print(void *fp, const BIGNUM *a); -#endif int BN_reciprocal(BIGNUM *r, const BIGNUM *m, int len, BN_CTX *ctx); int BN_rshift(BIGNUM *r, const BIGNUM *a, int n); int BN_rshift1(BIGNUM *r, const BIGNUM *a); -- 2.20.1