diff options
author | Ambroz Bizjak <abizjak.pro@gmail.com> | 2018-12-30 15:51:24 +0300 |
---|---|---|
committer | Ambroz Bizjak <abizjak.pro@gmail.com> | 2018-12-30 17:51:55 +0300 |
commit | 7c63ea175de405708fc075fd1234ad832f2cf436 (patch) | |
tree | 21f7eb84bb802e69d3c6a3e44410f3784b9586d7 | |
parent | 27382229dca94f8368a1956738de77b4f14601a2 (diff) |
Assume that NSS headers are under nss/.
-rw-r--r-- | client/PasswordListener.c | 2 | ||||
-rw-r--r-- | client/PasswordListener.h | 4 | ||||
-rw-r--r-- | client/PeerChat.c | 4 | ||||
-rw-r--r-- | client/PeerChat.h | 4 | ||||
-rw-r--r-- | client/StreamPeerIO.c | 4 | ||||
-rw-r--r-- | client/StreamPeerIO.h | 4 | ||||
-rw-r--r-- | cmake/modules/FindNSS.cmake | 2 | ||||
-rw-r--r-- | misc/nsskey.h | 6 | ||||
-rw-r--r-- | nspr_support/BSSLConnection.c | 2 | ||||
-rw-r--r-- | nspr_support/BSSLConnection.h | 2 | ||||
-rw-r--r-- | server/server.c | 10 | ||||
-rw-r--r-- | server_connection/ServerConnection.h | 10 |
12 files changed, 27 insertions, 27 deletions
diff --git a/client/PasswordListener.c b/client/PasswordListener.c index 5ec573b..e712f5e 100644 --- a/client/PasswordListener.c +++ b/client/PasswordListener.c @@ -31,7 +31,7 @@ #include <prerror.h> -#include <ssl.h> +#include <nss/ssl.h> #include <misc/offset.h> #include <misc/byteorder.h> diff --git a/client/PasswordListener.h b/client/PasswordListener.h index bbc0bd1..70f3ba7 100644 --- a/client/PasswordListener.h +++ b/client/PasswordListener.h @@ -39,8 +39,8 @@ #include <prio.h> -#include <cert.h> -#include <keyhi.h> +#include <nss/cert.h> +#include <nss/keyhi.h> #include <misc/debug.h> #include <misc/sslsocket.h> diff --git a/client/PeerChat.c b/client/PeerChat.c index d9dd966..a4bd556 100644 --- a/client/PeerChat.c +++ b/client/PeerChat.c @@ -29,8 +29,8 @@ #include <string.h> -#include <ssl.h> -#include <sslerr.h> +#include <nss/ssl.h> +#include <nss/sslerr.h> #include <misc/byteorder.h> #include <security/BRandom.h> diff --git a/client/PeerChat.h b/client/PeerChat.h index 674e374..0b2387e 100644 --- a/client/PeerChat.h +++ b/client/PeerChat.h @@ -30,8 +30,8 @@ #ifndef BADVPN_PEERCHAT_H #define BADVPN_PEERCHAT_H -#include <cert.h> -#include <keyhi.h> +#include <nss/cert.h> +#include <nss/keyhi.h> #include <protocol/packetproto.h> #include <protocol/scproto.h> diff --git a/client/StreamPeerIO.c b/client/StreamPeerIO.c index 3113c3b..0b70588 100644 --- a/client/StreamPeerIO.c +++ b/client/StreamPeerIO.c @@ -29,8 +29,8 @@ #include <stdlib.h> -#include <ssl.h> -#include <sslerr.h> +#include <nss/ssl.h> +#include <nss/sslerr.h> #include <misc/offset.h> #include <misc/byteorder.h> diff --git a/client/StreamPeerIO.h b/client/StreamPeerIO.h index 0b6b260..b622f66 100644 --- a/client/StreamPeerIO.h +++ b/client/StreamPeerIO.h @@ -36,8 +36,8 @@ #include <stdint.h> -#include <cert.h> -#include <keyhi.h> +#include <nss/cert.h> +#include <nss/keyhi.h> #include <misc/debug.h> #include <base/DebugObject.h> diff --git a/cmake/modules/FindNSS.cmake b/cmake/modules/FindNSS.cmake index 17fd45a..8527910 100644 --- a/cmake/modules/FindNSS.cmake +++ b/cmake/modules/FindNSS.cmake @@ -20,7 +20,7 @@ endif () set(NSS_FOUND FALSE) if (WIN32) - find_path(NSS_FIND_INCLUDE_DIR nss.h) + find_path(NSS_FIND_INCLUDE_DIR nss/nss.h) FIND_LIBRARY_WITH_DEBUG(NSS_FIND_LIBRARIES_SSL WIN32_DEBUG_POSTFIX d NAMES ssl3) FIND_LIBRARY_WITH_DEBUG(NSS_FIND_LIBRARIES_SMIME WIN32_DEBUG_POSTFIX d NAMES smime3) diff --git a/misc/nsskey.h b/misc/nsskey.h index 8268235..6bdb5fc 100644 --- a/misc/nsskey.h +++ b/misc/nsskey.h @@ -37,9 +37,9 @@ #include <stdlib.h> #include <prerror.h> -#include <cert.h> -#include <keyhi.h> -#include <pk11func.h> +#include <nss/cert.h> +#include <nss/keyhi.h> +#include <nss/pk11func.h> #include <base/BLog.h> diff --git a/nspr_support/BSSLConnection.c b/nspr_support/BSSLConnection.c index fea9c94..8fafc97 100644 --- a/nspr_support/BSSLConnection.c +++ b/nspr_support/BSSLConnection.c @@ -28,7 +28,7 @@ */ #include <prerror.h> -#include <ssl.h> +#include <nss/ssl.h> #include <string.h> #include <stdlib.h> diff --git a/nspr_support/BSSLConnection.h b/nspr_support/BSSLConnection.h index 1152cac..deb1471 100644 --- a/nspr_support/BSSLConnection.h +++ b/nspr_support/BSSLConnection.h @@ -31,7 +31,7 @@ #define BADVPN_BSSLCONNECTION_H #include <prio.h> -#include <ssl.h> +#include <nss/ssl.h> #include <misc/debug.h> #include <misc/debugerror.h> diff --git a/server/server.c b/server/server.c index 2b22101..a79b0ab 100644 --- a/server/server.c +++ b/server/server.c @@ -38,11 +38,11 @@ #include <prio.h> #include <prerror.h> #include <prtypes.h> -#include <nss.h> -#include <ssl.h> -#include <cert.h> -#include <keyhi.h> -#include <secasn1.h> +#include <nss/nss.h> +#include <nss/ssl.h> +#include <nss/cert.h> +#include <nss/keyhi.h> +#include <nss/secasn1.h> // BadVPN #include <misc/version.h> diff --git a/server_connection/ServerConnection.h b/server_connection/ServerConnection.h index 1245c84..50a16ec 100644 --- a/server_connection/ServerConnection.h +++ b/server_connection/ServerConnection.h @@ -40,11 +40,11 @@ #include <prio.h> #include <prerror.h> #include <prtypes.h> -#include <nss.h> -#include <ssl.h> -#include <pk11func.h> -#include <cert.h> -#include <keyhi.h> +#include <nss/nss.h> +#include <nss/ssl.h> +#include <nss/pk11func.h> +#include <nss/cert.h> +#include <nss/keyhi.h> #include <misc/debug.h> #include <misc/debugerror.h> |