summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-07-11 09:25:24 +0000
committerjsing <jsing@openbsd.org>2014-07-11 09:25:24 +0000
commitfbc627cc42304bdfa3eac86e9f0470915e7b6123 (patch)
treeb5eda0cd07f0b93cfb2fced04855887a7a2eaa16 /lib/libssl/src
parentRemove the PSK code. We don't need to drag around this (diff)
downloadwireguard-openbsd-fbc627cc42304bdfa3eac86e9f0470915e7b6123.tar.xz
wireguard-openbsd-fbc627cc42304bdfa3eac86e9f0470915e7b6123.zip
Revert change that snuck into previous commit.
Diffstat (limited to 'lib/libssl/src')
-rw-r--r--lib/libssl/src/crypto/err/err.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/libssl/src/crypto/err/err.h b/lib/libssl/src/crypto/err/err.h
index 2bd6f0e8aad..ced340ea80f 100644
--- a/lib/libssl/src/crypto/err/err.h
+++ b/lib/libssl/src/crypto/err/err.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: err.h,v 1.20 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: err.h,v 1.21 2014/07/11 09:25:24 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -114,10 +114,8 @@
#include <openssl/opensslconf.h>
-#ifndef LIBRESSL_INTERNAL
#include <stdio.h>
#include <stdlib.h>
-#endif
#include <openssl/ossl_typ.h>
#ifndef OPENSSL_NO_BIO