From 81b6b7632b2207a2dbd7b6d803912ee3779176aa Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 10 Jul 2014 22:13:39 +0000
Subject: OPENSSL_stderr() is unused so nuke it. OPENSSL_showfatal() is only
 used by OpenSSLDie(), which is in the same file, so just make it static.

ok miod@
---
 src/lib/libcrypto/cryptlib.c         | 11 ++---------
 src/lib/libcrypto/cryptlib.h         |  4 +---
 src/lib/libssl/src/crypto/cryptlib.c | 11 ++---------
 src/lib/libssl/src/crypto/cryptlib.h |  4 +---
 4 files changed, 6 insertions(+), 24 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c
index 86f51917e2..75d66d4ee9 100644
--- a/src/lib/libcrypto/cryptlib.c
+++ b/src/lib/libcrypto/cryptlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.c,v 1.29 2014/07/10 20:02:58 jsing Exp $ */
+/* $OpenBSD: cryptlib.c,v 1.30 2014/07/10 22:13:39 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -688,8 +688,7 @@ OPENSSL_cpuid_setup(void)
 }
 #endif
 
-
-void
+static void
 OPENSSL_showfatal(const char *fmta, ...)
 {
 	va_list ap;
@@ -708,12 +707,6 @@ OpenSSLDie(const char *file, int line, const char *assertion)
 	abort();
 }
 
-void *
-OPENSSL_stderr(void)
-{
-	return stderr;
-}
-
 int
 CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
 {
diff --git a/src/lib/libcrypto/cryptlib.h b/src/lib/libcrypto/cryptlib.h
index ad669a2745..679af821c1 100644
--- a/src/lib/libcrypto/cryptlib.h
+++ b/src/lib/libcrypto/cryptlib.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.h,v 1.22 2014/07/10 20:42:45 jsing Exp $ */
+/* $OpenBSD: cryptlib.h,v 1.23 2014/07/10 22:13:39 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -78,8 +78,6 @@ extern "C" {
 
 void OPENSSL_cpuid_setup(void);
 extern unsigned int OPENSSL_ia32cap_P[];
-void OPENSSL_showfatal(const char *fmta,...);
-void *OPENSSL_stderr(void);
 
 #ifdef  __cplusplus
 }
diff --git a/src/lib/libssl/src/crypto/cryptlib.c b/src/lib/libssl/src/crypto/cryptlib.c
index 86f51917e2..75d66d4ee9 100644
--- a/src/lib/libssl/src/crypto/cryptlib.c
+++ b/src/lib/libssl/src/crypto/cryptlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.c,v 1.29 2014/07/10 20:02:58 jsing Exp $ */
+/* $OpenBSD: cryptlib.c,v 1.30 2014/07/10 22:13:39 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -688,8 +688,7 @@ OPENSSL_cpuid_setup(void)
 }
 #endif
 
-
-void
+static void
 OPENSSL_showfatal(const char *fmta, ...)
 {
 	va_list ap;
@@ -708,12 +707,6 @@ OpenSSLDie(const char *file, int line, const char *assertion)
 	abort();
 }
 
-void *
-OPENSSL_stderr(void)
-{
-	return stderr;
-}
-
 int
 CRYPTO_memcmp(const void *in_a, const void *in_b, size_t len)
 {
diff --git a/src/lib/libssl/src/crypto/cryptlib.h b/src/lib/libssl/src/crypto/cryptlib.h
index ad669a2745..679af821c1 100644
--- a/src/lib/libssl/src/crypto/cryptlib.h
+++ b/src/lib/libssl/src/crypto/cryptlib.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.h,v 1.22 2014/07/10 20:42:45 jsing Exp $ */
+/* $OpenBSD: cryptlib.h,v 1.23 2014/07/10 22:13:39 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -78,8 +78,6 @@ extern "C" {
 
 void OPENSSL_cpuid_setup(void);
 extern unsigned int OPENSSL_ia32cap_P[];
-void OPENSSL_showfatal(const char *fmta,...);
-void *OPENSSL_stderr(void);
 
 #ifdef  __cplusplus
 }
-- 
cgit v1.2.3-55-g6feb