libfreerdp-sspi: fix headers

2026-04-15 00:44:19 +09:00 · 2012-03-05 17:23:22 -05:00
parent c208c5a899
commit 6ed928f362
20 changed files with 44 additions and 44 deletions
--- a/cunit/test_ntlm.c
+++ b/cunit/test_ntlm.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <freerdp/freerdp.h>
-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>

 #include "libfreerdp-sspi/NTLM/ntlm.h"
 #include "libfreerdp-sspi/NTLM/ntlm_compute.h"
--- a/cunit/test_sspi.c
+++ b/cunit/test_sspi.c
@@ -23,7 +23,7 @@
 #include <freerdp/utils/hexdump.h>

 #include "test_sspi.h"
-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>

 #define NTLM_PACKAGE_NAME		"NTLM"

--- a/include/freerdp/sspi/credssp.h
+++ b/include/freerdp/sspi/credssp.h
@@ -17,8 +17,8 @@
 * limitations under the License.
 */

-#ifndef FREERDP_AUTH_CREDSSP_H
-#define FREERDP_AUTH_CREDSSP_H
+#ifndef FREERDP_SSPI_CREDSSP_H
+#define FREERDP_SSPI_CREDSSP_H

 typedef struct rdp_credssp rdpCredssp;

@@ -28,7 +28,7 @@ typedef struct rdp_credssp rdpCredssp;
 #include <freerdp/utils/stream.h>
 #include <freerdp/utils/hexdump.h>

-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>

 #include <freerdp/crypto/tls.h>
 #include <freerdp/crypto/ber.h>
@@ -68,4 +68,4 @@ SECURITY_STATUS credssp_encrypt_ts_credentials(rdpCredssp* credssp);
 FREERDP_API rdpCredssp* credssp_new(freerdp* instance, rdpTls* tls, rdpSettings* settings);
 FREERDP_API void credssp_free(rdpCredssp* credssp);

-#endif /* FREERDP_AUTH_CREDSSP_H */
+#endif /* FREERDP_SSPI_CREDSSP_H */
--- a/include/freerdp/sspi/sspi.h
+++ b/include/freerdp/sspi/sspi.h
@@ -17,8 +17,8 @@
 * limitations under the License.
 */

-#ifndef FREERDP_AUTH_SSPI_H
-#define FREERDP_AUTH_SSPI_H
+#ifndef FREERDP_SSPI_H
+#define FREERDP_SSPI_H

 #include <freerdp/api.h>
 #include <freerdp/types.h>
@@ -727,4 +727,4 @@ FREERDP_API SECURITY_STATUS VerifySignature(CTXT_HANDLE* phContext, SEC_BUFFER_D
 void sspi_GlobalInit();
 void sspi_GlobalFinish();

-#endif /* FREERDP_AUTH_SSPI_H */
+#endif /* FREERDP_SSPI_H */
--- a/libfreerdp-core/transport.c
+++ b/libfreerdp-core/transport.c
@@ -39,7 +39,7 @@
 #include "fastpath.h"
 #include "transport.h"

-#include <freerdp/auth/credssp.h>
+#include <freerdp/sspi/credssp.h>

 #define BUFFER_SIZE 16384

--- a/libfreerdp-core/transport.h
+++ b/libfreerdp-core/transport.h
@@ -31,7 +31,7 @@ typedef struct rdp_transport rdpTransport;

 #include "tcp.h"
 #include <freerdp/crypto/tls.h>
-#include <freerdp/auth/credssp.h>
+#include <freerdp/sspi/credssp.h>

 #include <time.h>
 #include <freerdp/types.h>
--- a/libfreerdp-sspi/Kerberos/kerberos.c
+++ b/libfreerdp-sspi/Kerberos/kerberos.c
@@ -43,7 +43,7 @@
 #include "kerberos_encode.h"
 #include "kerberos_decode.h"

-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>
 #include <freerdp/utils/blob.h>
 #include <freerdp/utils/memory.h>
 #include <freerdp/utils/unicode.h>
--- a/libfreerdp-sspi/Kerberos/kerberos.h
+++ b/libfreerdp-sspi/Kerberos/kerberos.h
@@ -17,8 +17,8 @@
 * limitations under the License.
 */

-#ifndef __FREERDP_KRB_H
-#define __FREERDP_KRB_H
+#ifndef FREERDP_SSPI_KERBEROS_PRIVATE_H
+#define FREERDP_SSPI_KERBEROS_PRIVATE_H

 #include <sys/types.h>
 #include <netinet/in.h>
@@ -31,7 +31,7 @@
 #include <ws2tcpip.h>
 #endif

-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>
 #include <freerdp/types.h>
 #include <freerdp/settings.h>
 #include <freerdp/utils/stream.h>
@@ -344,4 +344,4 @@ void krb_free_tgsreq(KrbTGSREQ* krb_tgsreq);
 void krb_free_tgsrep(KrbTGSREP* krb_tgsrep);
 void krb_free_krb_error(KrbERROR* krb_err);

-#endif /* __FREERDP_KRB_H */
+#endif /* FREERDP_SSPI_KERBEROS_PRIVATE_H */
--- a/libfreerdp-sspi/Kerberos/kerberos_crypto.h
+++ b/libfreerdp-sspi/Kerberos/kerberos_crypto.h
@@ -17,8 +17,8 @@
 * limitations under the License.
 */

-#ifndef __KRB_CRYPTO_H
-#define __KRB_CRYPTO_H
+#ifndef FREERDP_SSPI_KERBEROS_CRYPTO_H
+#define FREERDP_SSPI_KERBEROS_CRYPTO_H

 #include <openssl/err.h>
 #include <openssl/rc4.h>
@@ -53,4 +53,4 @@ rdpBlob* crypto_kdcmsg_decrypt(rdpBlob* msg, KrbENCKey* key, uint32 msgtype);
 rdpBlob* crypto_kdcmsg_cksum_hmacmd5(rdpBlob* msg, uint8* key, uint32 msgtype);
 rdpBlob* crypto_kdcmsg_cksum(rdpBlob* msg, KrbENCKey* key, uint32 msgtype);

-#endif /* __KRB_CRYPTO_H */
+#endif /* FREERDP_SSPI_KERBEROS_CRYPTO_H */
--- a/libfreerdp-sspi/Kerberos/kerberos_decode.h
+++ b/libfreerdp-sspi/Kerberos/kerberos_decode.h
@@ -21,8 +21,8 @@

 #include "kerberos.h"

-#ifndef __KRB_DECODE_H
-#define __KRB_DECODE_H
+#ifndef FREERDP_SSPI_KERBEROS_DECODE_H
+#define FREERDP_SSPI_KERBEROS_DECODE_H

 int krb_decode_application_tag(STREAM* s, uint8 tag, int *length);
 int krb_decode_sequence_tag(STREAM* s, int *length);
@@ -44,4 +44,4 @@ int krb_decode_krb_error(STREAM* s, KrbERROR* krb_err, sint32 maxlen);
 ENCKDCREPPart* krb_decode_enc_reppart(rdpBlob* msg, uint8 apptag);
 int krb_decode_tgtrep(STREAM* s, KrbTGTREP* krb_tgtrep);

-#endif /* __KRB_DECODE_H */
+#endif /* FREERDP_SSPI_KERBEROS_DECODE_H */
--- a/libfreerdp-sspi/Kerberos/kerberos_encode.h
+++ b/libfreerdp-sspi/Kerberos/kerberos_encode.h
@@ -21,8 +21,8 @@

 #include "kerberos.h"

-#ifndef __KRB_ENCODE_H
-#define __KRB_ENCODE_H
+#ifndef FREERDP_SSPI_KERBEROS_ENCODE_H
+#define FREERDP_SSPI_KERBEROS_ENCODE_H

 int krb_encode_sequence_tag(STREAM* s, uint32 len);
 int krb_encode_contextual_tag(STREAM* s, uint8 tag, uint32 len);
@@ -45,4 +45,4 @@ int krb_encode_req_body(STREAM* s, KDCReqBody* req_body, int msgtype);
 int krb_encode_apreq(STREAM* s, KrbAPREQ* krb_apreq);
 int krb_encode_tgtreq(STREAM* s, KrbTGTREQ* krb_tgtreq);

-#endif /* __KRB_ENCODE_H */
+#endif /* FREERDP_SSPI_KERBEROS_ENCODE_H */
--- a/libfreerdp-sspi/NTLM/ntlm.c
+++ b/libfreerdp-sspi/NTLM/ntlm.c
@@ -25,7 +25,7 @@
 #include <openssl/engine.h>
 #include <freerdp/utils/memory.h>

-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>

 #include "ntlm.h"
 #include "../sspi.h"
--- a/libfreerdp-sspi/NTLM/ntlm.h
+++ b/libfreerdp-sspi/NTLM/ntlm.h
@@ -17,10 +17,10 @@
 * limitations under the License.
 */

-#ifndef FREERDP_AUTH_NTLM_PRIVATE_H
-#define FREERDP_AUTH_NTLM_PRIVATE_H
+#ifndef FREERDP_SSPI_NTLM_PRIVATE_H
+#define FREERDP_SSPI_NTLM_PRIVATE_H

-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>
 #include <freerdp/crypto/crypto.h>

 #include <freerdp/utils/unicode.h>
@@ -117,4 +117,4 @@ void ntlm_ContextFree(NTLM_CONTEXT* context);

 //#define WITH_DEBUG_NTLM		1

-#endif /* FREERDP_AUTH_NTLM_PRIVATE_H */
+#endif /* FREERDP_SSPI_NTLM_PRIVATE_H */
--- a/libfreerdp-sspi/NTLM/ntlm_compute.h
+++ b/libfreerdp-sspi/NTLM/ntlm_compute.h
@@ -17,8 +17,8 @@
 * limitations under the License.
 */

-#ifndef FREERDP_AUTH_NTLM_COMPUTE_H
-#define FREERDP_AUTH_NTLM_COMPUTE_H
+#ifndef FREERDP_SSPI_NTLM_COMPUTE_H
+#define FREERDP_SSPI_NTLM_COMPUTE_H

 #include "ntlm.h"

--- a/libfreerdp-sspi/NTLM/ntlm_message.h
+++ b/libfreerdp-sspi/NTLM/ntlm_message.h
@@ -17,8 +17,8 @@
 * limitations under the License.
 */

-#ifndef FREERDP_AUTH_NTLM_MESSAGE_H
-#define FREERDP_AUTH_NTLM_MESSAGE_H
+#ifndef FREERDP_SSPI_NTLM_MESSAGE_H
+#define FREERDP_SSPI_NTLM_MESSAGE_H

 #include "ntlm.h"

@@ -29,4 +29,4 @@ SECURITY_STATUS ntlm_write_ChallengeMessage(NTLM_CONTEXT* context, SEC_BUFFER* b
 SECURITY_STATUS ntlm_read_AuthenticateMessage(NTLM_CONTEXT* context, SEC_BUFFER* buffer);
 SECURITY_STATUS ntlm_write_AuthenticateMessage(NTLM_CONTEXT* context, SEC_BUFFER* buffer);

-#endif /* FREERDP_AUTH_NTLM_MESSAGE_H */
+#endif /* FREERDP_SSPI_NTLM_MESSAGE_H */
--- a/libfreerdp-sspi/Negotiate/negotiate.c
+++ b/libfreerdp-sspi/Negotiate/negotiate.c
@@ -17,7 +17,7 @@
 * limitations under the License.
 */

-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>
 #include <freerdp/utils/memory.h>

 #include "negotiate.h"
--- a/libfreerdp-sspi/Negotiate/negotiate.h
+++ b/libfreerdp-sspi/Negotiate/negotiate.h
@@ -17,10 +17,10 @@
 * limitations under the License.
 */

-#ifndef FREERDP_AUTH_NEGOTIATE_PRIVATE_H
-#define FREERDP_AUTH_NEGOTIATE_PRIVATE_H
+#ifndef FREERDP_SSPI_NEGOTIATE_PRIVATE_H
+#define FREERDP_SSPI_NEGOTIATE_PRIVATE_H

-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>
 #include <freerdp/utils/unicode.h>

 #include "../Kerberos/kerberos.h"
@@ -52,5 +52,5 @@ typedef struct _NEGOTIATE_CONTEXT NEGOTIATE_CONTEXT;
 NEGOTIATE_CONTEXT* negotiate_ContextNew();
 void negotiate_ContextFree(NEGOTIATE_CONTEXT* context);

-#endif /* FREERDP_AUTH_NEGOTIATE_PRIVATE_H */
+#endif /* FREERDP_SSPI_NEGOTIATE_PRIVATE_H */

--- a/libfreerdp-sspi/credssp.c
+++ b/libfreerdp-sspi/credssp.c
@@ -25,8 +25,8 @@
 #include <freerdp/crypto/tls.h>
 #include <freerdp/utils/stream.h>

-#include <freerdp/auth/sspi.h>
-#include <freerdp/auth/credssp.h>
+#include <freerdp/sspi/sspi.h>
+#include <freerdp/sspi/credssp.h>

 #include "sspi.h"

--- a/libfreerdp-sspi/sspi.c
+++ b/libfreerdp-sspi/sspi.c
@@ -19,7 +19,7 @@

 #include <freerdp/utils/memory.h>

-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>

 #include "sspi.h"

--- a/libfreerdp-sspi/sspi.h
+++ b/libfreerdp-sspi/sspi.h
@@ -21,7 +21,7 @@
 #define FREERDP_AUTH_SSPI_PRIVATE_H

 #include <freerdp/types.h>
-#include <freerdp/auth/sspi.h>
+#include <freerdp/sspi/sspi.h>

 struct _CREDENTIALS
 {