aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2013-11-04 10:47:22 +0100
committerAris Adamantiadis <aris@0xbadc0de.be>2013-11-04 10:47:22 +0100
commitcb165df64eef762e1146bcd5bd21944c2c09ca4b (patch)
treeaeee9798a460e9b6eb114badc639c4c50a4c120b
parente4c4f57f058ebdb0a4eaa1939f2d7cb36a1c738f (diff)
downloadlibssh-cb165df64eef762e1146bcd5bd21944c2c09ca4b.tar.gz
libssh-cb165df64eef762e1146bcd5bd21944c2c09ca4b.tar.xz
libssh-cb165df64eef762e1146bcd5bd21944c2c09ca4b.zip
remove warnings on OSX (workaround)
-rw-r--r--include/libssh/priv.h10
-rw-r--r--src/pki_crypto.c4
2 files changed, 12 insertions, 2 deletions
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 66fd54fc..d8176d90 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -155,6 +155,16 @@ int gettimeofday(struct timeval *__p, void *__t);
#include <sys/time.h>
#endif
+/*
+ * get rid of deprecacy warnings on OSX when using OpenSSL
+ */
+#if defined(__APPLE__)
+ #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
+ #undef MAC_OS_X_VERSION_MIN_REQUIRED
+ #endif
+ #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_6
+#endif
+
/* forward declarations */
struct ssh_common_struct;
struct ssh_kex_struct;
diff --git a/src/pki_crypto.c b/src/pki_crypto.c
index 04fea74e..e87d7ace 100644
--- a/src/pki_crypto.c
+++ b/src/pki_crypto.c
@@ -25,6 +25,8 @@
#ifndef _PKI_CRYPTO_H
#define _PKI_CRYPTO_H
+#include "libssh/priv.h"
+
#include <openssl/pem.h>
#include <openssl/dsa.h>
#include <openssl/err.h>
@@ -37,8 +39,6 @@
#include <openssl/ecdsa.h>
#endif
-
-#include "libssh/priv.h"
#include "libssh/libssh.h"
#include "libssh/buffer.h"
#include "libssh/session.h"