libwinpr-sspi: rename from libfreerdp-sspi
This commit is contained in:
parent
e1e3f12114
commit
31f2fd3a8a
@ -156,12 +156,12 @@ add_subdirectory(libfreerdp-rail)
|
|||||||
add_subdirectory(libfreerdp-cache)
|
add_subdirectory(libfreerdp-cache)
|
||||||
add_subdirectory(libfreerdp-codec)
|
add_subdirectory(libfreerdp-codec)
|
||||||
add_subdirectory(libfreerdp-crypto)
|
add_subdirectory(libfreerdp-crypto)
|
||||||
add_subdirectory(libfreerdp-sspi)
|
|
||||||
add_subdirectory(libfreerdp-channels)
|
add_subdirectory(libfreerdp-channels)
|
||||||
add_subdirectory(libfreerdp-locale)
|
add_subdirectory(libfreerdp-locale)
|
||||||
add_subdirectory(libfreerdp-core)
|
add_subdirectory(libfreerdp-core)
|
||||||
|
|
||||||
add_subdirectory(libwinpr-rpc)
|
add_subdirectory(libwinpr-rpc)
|
||||||
|
add_subdirectory(libwinpr-sspi)
|
||||||
|
|
||||||
if(NOT WIN32)
|
if(NOT WIN32)
|
||||||
add_subdirectory(channels)
|
add_subdirectory(channels)
|
||||||
|
@ -28,7 +28,7 @@ typedef struct rdp_credssp rdpCredssp;
|
|||||||
#include <freerdp/utils/stream.h>
|
#include <freerdp/utils/stream.h>
|
||||||
#include <freerdp/utils/hexdump.h>
|
#include <freerdp/utils/hexdump.h>
|
||||||
|
|
||||||
#include <freerdp/sspi/sspi.h>
|
#include <winpr/sspi.h>
|
||||||
|
|
||||||
#include <freerdp/crypto/tls.h>
|
#include <freerdp/crypto/tls.h>
|
||||||
#include <freerdp/crypto/ber.h>
|
#include <freerdp/crypto/ber.h>
|
@ -105,11 +105,11 @@ endif()
|
|||||||
target_link_libraries(freerdp-core freerdp-utils)
|
target_link_libraries(freerdp-core freerdp-utils)
|
||||||
target_link_libraries(freerdp-core freerdp-codec)
|
target_link_libraries(freerdp-core freerdp-codec)
|
||||||
target_link_libraries(freerdp-core freerdp-crypto)
|
target_link_libraries(freerdp-core freerdp-crypto)
|
||||||
target_link_libraries(freerdp-core freerdp-sspi)
|
|
||||||
target_link_libraries(freerdp-core freerdp-locale)
|
target_link_libraries(freerdp-core freerdp-locale)
|
||||||
target_link_libraries(freerdp-core ${OPENSSL_LIBRARIES})
|
target_link_libraries(freerdp-core ${OPENSSL_LIBRARIES})
|
||||||
|
|
||||||
target_link_libraries(freerdp-core winpr-rpc)
|
target_link_libraries(freerdp-core winpr-rpc)
|
||||||
|
target_link_libraries(freerdp-core winpr-sspi)
|
||||||
|
|
||||||
install(TARGETS freerdp-core DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
install(TARGETS freerdp-core DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
|
|
||||||
|
@ -30,9 +30,9 @@ typedef struct rdp_ntlm_http rdpNtlmHttp;
|
|||||||
#include "transport.h"
|
#include "transport.h"
|
||||||
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <winpr/sspi.h>
|
||||||
#include <freerdp/types.h>
|
#include <freerdp/types.h>
|
||||||
#include <freerdp/settings.h>
|
#include <freerdp/settings.h>
|
||||||
#include <freerdp/sspi/sspi.h>
|
|
||||||
#include <freerdp/crypto/tls.h>
|
#include <freerdp/crypto/tls.h>
|
||||||
#include <freerdp/crypto/crypto.h>
|
#include <freerdp/crypto/crypto.h>
|
||||||
#include <freerdp/utils/wait_obj.h>
|
#include <freerdp/utils/wait_obj.h>
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
#include "fastpath.h"
|
#include "fastpath.h"
|
||||||
#include "transport.h"
|
#include "transport.h"
|
||||||
|
|
||||||
#include <freerdp/sspi/credssp.h>
|
#include <winpr/credssp.h>
|
||||||
|
|
||||||
#define BUFFER_SIZE 16384
|
#define BUFFER_SIZE 16384
|
||||||
|
|
||||||
|
@ -32,8 +32,9 @@ typedef struct rdp_transport rdpTransport;
|
|||||||
|
|
||||||
#include "tcp.h"
|
#include "tcp.h"
|
||||||
#include "tsg.h"
|
#include "tsg.h"
|
||||||
|
|
||||||
|
#include <winpr/sspi.h>
|
||||||
#include <freerdp/crypto/tls.h>
|
#include <freerdp/crypto/tls.h>
|
||||||
#include <freerdp/sspi/credssp.h>
|
|
||||||
|
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
#include <freerdp/types.h>
|
#include <freerdp/types.h>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
# FreeRDP: A Remote Desktop Protocol Client
|
# WinPR: Windows Portable Runtime
|
||||||
# libfreerdp-sspi cmake build script
|
# libwinpr-sspi cmake build script
|
||||||
#
|
#
|
||||||
# Copyright 2011 O.S. Systems Software Ltda.
|
# Copyright 2011 O.S. Systems Software Ltda.
|
||||||
# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
|
# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
|
||||||
@ -17,7 +17,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
set(FREERDP_SSPI_NTLM_SRCS
|
set(WINPR_SSPI_NTLM_SRCS
|
||||||
NTLM/ntlm_av_pairs.c
|
NTLM/ntlm_av_pairs.c
|
||||||
NTLM/ntlm_av_pairs.h
|
NTLM/ntlm_av_pairs.h
|
||||||
NTLM/ntlm_compute.c
|
NTLM/ntlm_compute.c
|
||||||
@ -27,7 +27,7 @@ set(FREERDP_SSPI_NTLM_SRCS
|
|||||||
NTLM/ntlm.c
|
NTLM/ntlm.c
|
||||||
NTLM/ntlm.h)
|
NTLM/ntlm.h)
|
||||||
|
|
||||||
set(FREERDP_SSPI_KERBEROS_SRCS
|
set(WINPR_SSPI_KERBEROS_SRCS
|
||||||
Kerberos/kerberos_crypto.c
|
Kerberos/kerberos_crypto.c
|
||||||
Kerberos/kerberos_crypto.h
|
Kerberos/kerberos_crypto.h
|
||||||
Kerberos/kerberos_decode.c
|
Kerberos/kerberos_decode.c
|
||||||
@ -37,36 +37,36 @@ set(FREERDP_SSPI_KERBEROS_SRCS
|
|||||||
Kerberos/kerberos.c
|
Kerberos/kerberos.c
|
||||||
Kerberos/kerberos.h)
|
Kerberos/kerberos.h)
|
||||||
|
|
||||||
set(FREERDP_SSPI_NEGOTIATE_SRCS
|
set(WINPR_SSPI_NEGOTIATE_SRCS
|
||||||
Negotiate/negotiate.c
|
Negotiate/negotiate.c
|
||||||
Negotiate/negotiate.h)
|
Negotiate/negotiate.h)
|
||||||
|
|
||||||
set(FREERDP_SSPI_SRCS
|
set(WINPR_SSPI_SRCS
|
||||||
sspi.c
|
sspi.c
|
||||||
sspi.h
|
sspi.h
|
||||||
credssp.c)
|
credssp.c)
|
||||||
|
|
||||||
if(NOT WITH_NATIVE_SSPI)
|
if(NOT WITH_NATIVE_SSPI)
|
||||||
set(FREERDP_SSPI_SRCS
|
set(WINPR_SSPI_SRCS
|
||||||
${FREERDP_SSPI_NTLM_SRCS}
|
${WINPR_SSPI_NTLM_SRCS}
|
||||||
${FREERDP_SSPI_KERBEROS_SRCS}
|
${WINPR_SSPI_KERBEROS_SRCS}
|
||||||
${FREERDP_SSPI_NEGOTIATE_SRCS}
|
${WINPR_SSPI_NEGOTIATE_SRCS}
|
||||||
${FREERDP_SSPI_SRCS})
|
${WINPR_SSPI_SRCS})
|
||||||
else()
|
else()
|
||||||
add_definitions(-DNATIVE_SSPI)
|
add_definitions(-DNATIVE_SSPI)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
add_library(freerdp-sspi ${FREERDP_SSPI_SRCS})
|
add_library(winpr-sspi ${WINPR_SSPI_SRCS})
|
||||||
|
|
||||||
include_directories(${OPENSSL_INCLUDE_DIR})
|
include_directories(${OPENSSL_INCLUDE_DIR})
|
||||||
include_directories(${ZLIB_INCLUDE_DIRS})
|
include_directories(${ZLIB_INCLUDE_DIRS})
|
||||||
|
|
||||||
set_target_properties(freerdp-sspi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
|
set_target_properties(winpr-sspi PROPERTIES VERSION ${FREERDP_VERSION_FULL} SOVERSION ${FREERDP_VERSION} PREFIX "lib")
|
||||||
|
|
||||||
target_link_libraries(freerdp-sspi freerdp-utils)
|
target_link_libraries(winpr-sspi freerdp-utils)
|
||||||
target_link_libraries(freerdp-sspi freerdp-crypto)
|
target_link_libraries(winpr-sspi freerdp-crypto)
|
||||||
target_link_libraries(freerdp-sspi ${ZLIB_LIBRARIES})
|
target_link_libraries(winpr-sspi ${ZLIB_LIBRARIES})
|
||||||
|
|
||||||
install(TARGETS freerdp-sspi DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
install(TARGETS winpr-sspi DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
|
|
@ -37,7 +37,7 @@
|
|||||||
#include "kerberos_encode.h"
|
#include "kerberos_encode.h"
|
||||||
#include "kerberos_decode.h"
|
#include "kerberos_decode.h"
|
||||||
|
|
||||||
#include <freerdp/sspi/sspi.h>
|
#include <winpr/sspi.h>
|
||||||
|
|
||||||
#include <freerdp/utils/tcp.h>
|
#include <freerdp/utils/tcp.h>
|
||||||
#include <freerdp/utils/time.h>
|
#include <freerdp/utils/time.h>
|
@ -34,11 +34,11 @@
|
|||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
|
||||||
|
#include <winpr/sspi.h>
|
||||||
#include <freerdp/types.h>
|
#include <freerdp/types.h>
|
||||||
#include <freerdp/settings.h>
|
#include <freerdp/settings.h>
|
||||||
#include <freerdp/utils/stream.h>
|
#include <freerdp/utils/stream.h>
|
||||||
#include <freerdp/utils/blob.h>
|
#include <freerdp/utils/blob.h>
|
||||||
#include <freerdp/sspi/sspi.h>
|
|
||||||
|
|
||||||
#define MSKRB_OID "1.2.840.48018.1.2.2"
|
#define MSKRB_OID "1.2.840.48018.1.2.2"
|
||||||
#define STDKRB_OID "1.2.840.113554.1.2.2"
|
#define STDKRB_OID "1.2.840.113554.1.2.2"
|
@ -25,7 +25,7 @@
|
|||||||
#include <openssl/engine.h>
|
#include <openssl/engine.h>
|
||||||
#include <freerdp/utils/memory.h>
|
#include <freerdp/utils/memory.h>
|
||||||
|
|
||||||
#include <freerdp/sspi/sspi.h>
|
#include <winpr/sspi.h>
|
||||||
|
|
||||||
#include "ntlm.h"
|
#include "ntlm.h"
|
||||||
#include "../sspi.h"
|
#include "../sspi.h"
|
@ -20,7 +20,7 @@
|
|||||||
#ifndef FREERDP_SSPI_NTLM_PRIVATE_H
|
#ifndef FREERDP_SSPI_NTLM_PRIVATE_H
|
||||||
#define FREERDP_SSPI_NTLM_PRIVATE_H
|
#define FREERDP_SSPI_NTLM_PRIVATE_H
|
||||||
|
|
||||||
#include <freerdp/sspi/sspi.h>
|
#include <winpr/sspi.h>
|
||||||
#include <freerdp/crypto/crypto.h>
|
#include <freerdp/crypto/crypto.h>
|
||||||
|
|
||||||
#include <freerdp/utils/unicode.h>
|
#include <freerdp/utils/unicode.h>
|
@ -17,7 +17,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <freerdp/sspi/sspi.h>
|
#include <winpr//sspi.h>
|
||||||
#include <freerdp/utils/memory.h>
|
#include <freerdp/utils/memory.h>
|
||||||
|
|
||||||
#include "negotiate.h"
|
#include "negotiate.h"
|
@ -20,7 +20,7 @@
|
|||||||
#ifndef FREERDP_SSPI_NEGOTIATE_PRIVATE_H
|
#ifndef FREERDP_SSPI_NEGOTIATE_PRIVATE_H
|
||||||
#define FREERDP_SSPI_NEGOTIATE_PRIVATE_H
|
#define FREERDP_SSPI_NEGOTIATE_PRIVATE_H
|
||||||
|
|
||||||
#include <freerdp/sspi/sspi.h>
|
#include <winpr/sspi.h>
|
||||||
#include <freerdp/utils/unicode.h>
|
#include <freerdp/utils/unicode.h>
|
||||||
|
|
||||||
#include "../Kerberos/kerberos.h"
|
#include "../Kerberos/kerberos.h"
|
@ -26,8 +26,8 @@
|
|||||||
#include <freerdp/crypto/tls.h>
|
#include <freerdp/crypto/tls.h>
|
||||||
#include <freerdp/utils/stream.h>
|
#include <freerdp/utils/stream.h>
|
||||||
|
|
||||||
#include <freerdp/sspi/sspi.h>
|
#include <winpr/sspi.h>
|
||||||
#include <freerdp/sspi/credssp.h>
|
#include <winpr/credssp.h>
|
||||||
|
|
||||||
#include "sspi.h"
|
#include "sspi.h"
|
||||||
|
|
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
#include <freerdp/utils/memory.h>
|
#include <freerdp/utils/memory.h>
|
||||||
|
|
||||||
#include <freerdp/sspi/sspi.h>
|
#include <winpr/sspi.h>
|
||||||
|
|
||||||
#include "sspi.h"
|
#include "sspi.h"
|
||||||
|
|
@ -21,8 +21,9 @@
|
|||||||
#define FREERDP_AUTH_SSPI_PRIVATE_H
|
#define FREERDP_AUTH_SSPI_PRIVATE_H
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
|
||||||
|
#include <winpr/sspi.h>
|
||||||
#include <freerdp/types.h>
|
#include <freerdp/types.h>
|
||||||
#include <freerdp/sspi/sspi.h>
|
|
||||||
|
|
||||||
struct _CREDENTIALS
|
struct _CREDENTIALS
|
||||||
{
|
{
|
Loading…
Reference in New Issue
Block a user