From: Matt Caswell <matt@openssl.org>
Date: Sat, 10 Jan 2015 23:36:28 +0000 (+0000)
Subject: Fix warning where BIO_FLAGS_UPLINK was being redefined.
X-Git-Tag: OpenSSL_1_0_0q~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=94e5cf36bd0a9805a6fd0433a6fd8167467c7f3b;p=oweals%2Fopenssl.git

Fix warning where BIO_FLAGS_UPLINK was being redefined.
This warning breaks the build in 1.0.0 and 0.9.8

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit b1ffc6ca1c387efad0772c16dfe426afef45dc4f)
---

diff --git a/crypto/ecdsa/ecs_vrf.c b/crypto/ecdsa/ecs_vrf.c
index 2836efe5ef..188b9d57b4 100644
--- a/crypto/ecdsa/ecs_vrf.c
+++ b/crypto/ecdsa/ecs_vrf.c
@@ -57,7 +57,7 @@
  */
 
 #include "ecs_locl.h"
-#include "cryptlib.h"
+#include <string.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif