diff options
| author |   miod <miod@openbsd.org> | 2014-06-24 19:33:10 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-06-24 19:33:10 +0000 |
| commit | b4905b33e153637fddde91c650bf66d6f25aeee1 (patch) | |
| tree | 3d17054aeb9fbfbaa7bed3aef7752034438e5971 | |
| parent | Remove BIO_f_reliable(), guilty of playing with EVP_MD_CTX internals it (diff) | |
| download | wireguard-openbsd-b4905b33e153637fddde91c650bf66d6f25aeee1.tar.xz wireguard-openbsd-b4905b33e153637fddde91c650bf66d6f25aeee1.zip | |
Remove ancient workaround for previous century's compilers in the declaration
of CRYPTO_EX_DATA; riding upon the libcrypto major bump.
| -rw-r--r-- | lib/libcrypto/crypto.h | 3 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/crypto.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lib/libcrypto/crypto.h b/lib/libcrypto/crypto.h index 78e828fa2e2..5bf87c9e2e4 100644 --- a/lib/libcrypto/crypto.h +++ b/lib/libcrypto/crypto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.h,v 1.30 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: crypto.h,v 1.31 2014/06/24 19:33:10 miod Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -272,7 +272,6 @@ typedef struct bio_st BIO_dummy; struct crypto_ex_data_st { STACK_OF(void) *sk; - int dummy; /* gcc is screwing up this data structure :-( */ }; DECLARE_STACK_OF(void) diff --git a/lib/libssl/src/crypto/crypto.h b/lib/libssl/src/crypto/crypto.h index 78e828fa2e2..5bf87c9e2e4 100644 --- a/lib/libssl/src/crypto/crypto.h +++ b/lib/libssl/src/crypto/crypto.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto.h,v 1.30 2014/06/12 15:49:27 deraadt Exp $ */ +/* $OpenBSD: crypto.h,v 1.31 2014/06/24 19:33:10 miod Exp $ */ /* ==================================================================== * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. * @@ -272,7 +272,6 @@ typedef struct bio_st BIO_dummy; struct crypto_ex_data_st { STACK_OF(void) *sk; - int dummy; /* gcc is screwing up this data structure :-( */ }; DECLARE_STACK_OF(void) |