From 6299d185bc0b94efaeaca9cf0e8562f514e98551 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Thu, 24 Oct 2013 12:18:09 +0300 Subject: [PATCH] security: rename krb5 module to gssapi The module will support "old" Kerberos mode and "new" GSSAPI-only mode in the future. Therefore the old name no longer applies. --- siplcs.vcxproj | 4 ++-- siplcs.vcxproj.filters | 4 ++-- src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj | 8 ++++---- src/core/Makefile.am | 4 ++-- src/core/{sip-sec-krb5.c => sip-sec-gssapi.c} | 4 ++-- src/core/{sip-sec-krb5.h => sip-sec-gssapi.h} | 2 +- src/core/sip-sec-negotiate.c | 2 +- src/core/sip-sec.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) rename src/core/{sip-sec-krb5.c => sip-sec-gssapi.c} (99%) rename src/core/{sip-sec-krb5.h => sip-sec-gssapi.h} (97%) diff --git a/siplcs.vcxproj b/siplcs.vcxproj index 60ea56e4..4c433c24 100755 --- a/siplcs.vcxproj +++ b/siplcs.vcxproj @@ -143,7 +143,7 @@ - + @@ -222,7 +222,7 @@ - + diff --git a/siplcs.vcxproj.filters b/siplcs.vcxproj.filters index 3757e982..3d40c63a 100755 --- a/siplcs.vcxproj.filters +++ b/siplcs.vcxproj.filters @@ -21,7 +21,7 @@ core - + core @@ -236,7 +236,7 @@ core - + core diff --git a/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj b/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj index 3d48ca1f..aec07ce0 100644 --- a/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj +++ b/src/adium/SIPEAdiumPlugin.xcodeproj/project.pbxproj @@ -85,7 +85,7 @@ B13FAB6D119D5155001CE037 /* tests-load.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FAB5D119D5155001CE037 /* tests-load.c */; }; B13FAB6E119D5155001CE037 /* tests.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FAB5E119D5155001CE037 /* tests.c */; }; B13FABDF119D585A001CE037 /* sip-csta.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABA3119D585A001CE037 /* sip-csta.c */; }; - B13FABE1119D585A001CE037 /* sip-sec-krb5.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABA5119D585A001CE037 /* sip-sec-krb5.c */; }; + B13FABE1119D585A001CE037 /* sip-sec-gssapi.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABA5119D585A001CE037 /* sip-sec-gssapi.c */; }; B13FABE5119D585A001CE037 /* sip-sec-ntlm.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABA9119D585A001CE037 /* sip-sec-ntlm.c */; }; B13FABE9119D585A001CE037 /* sip-sec.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABAD119D585A001CE037 /* sip-sec.c */; }; B13FABEB119D585A001CE037 /* sip-transport.c in Sources */ = {isa = PBXBuildFile; fileRef = B13FABAF119D585A001CE037 /* sip-transport.c */; }; @@ -286,7 +286,7 @@ B13FAB5D119D5155001CE037 /* tests-load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "tests-load.c"; sourceTree = ""; }; B13FAB5E119D5155001CE037 /* tests.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tests.c; sourceTree = ""; }; B13FABA3119D585A001CE037 /* sip-csta.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sip-csta.c"; sourceTree = ""; }; - B13FABA5119D585A001CE037 /* sip-sec-krb5.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sip-sec-krb5.c"; sourceTree = ""; }; + B13FABA5119D585A001CE037 /* sip-sec-gssapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sip-sec-gssapi.c"; sourceTree = ""; }; B13FABA9119D585A001CE037 /* sip-sec-ntlm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sip-sec-ntlm.c"; sourceTree = ""; }; B13FABAD119D585A001CE037 /* sip-sec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sip-sec.c"; sourceTree = ""; }; B13FABAF119D585A001CE037 /* sip-transport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "sip-transport.c"; sourceTree = ""; }; @@ -516,7 +516,7 @@ B13FABAD119D585A001CE037 /* sip-sec.c */, B13FABA9119D585A001CE037 /* sip-sec-ntlm.c */, 1CE49FFE14A17FD100663393 /* sip-sec-ntlm-tests.c */, - B13FABA5119D585A001CE037 /* sip-sec-krb5.c */, + B13FABA5119D585A001CE037 /* sip-sec-gssapi.c */, 1CE4A00114A17FD100663393 /* sip-sec-digest.c */, 1CE4A00014A17FD100663393 /* sip-sec-tls-dsk.c */, 7B78059916DFF8D200B844A6 /* sip-sec-negotiate.c */, @@ -768,7 +768,7 @@ B13FAB6D119D5155001CE037 /* tests-load.c in Sources */, B13FAB6E119D5155001CE037 /* tests.c in Sources */, B13FABDF119D585A001CE037 /* sip-csta.c in Sources */, - B13FABE1119D585A001CE037 /* sip-sec-krb5.c in Sources */, + B13FABE1119D585A001CE037 /* sip-sec-gssapi.c in Sources */, B13FABE5119D585A001CE037 /* sip-sec-ntlm.c in Sources */, B13FABE9119D585A001CE037 /* sip-sec.c in Sources */, B13FABEB119D585A001CE037 /* sip-transport.c in Sources */, diff --git a/src/core/Makefile.am b/src/core/Makefile.am index 8b7e4951..b9c69759 100644 --- a/src/core/Makefile.am +++ b/src/core/Makefile.am @@ -143,8 +143,8 @@ endif if SIP_SEC_KRB5 libsipe_core_la_SOURCES += \ - sip-sec-krb5.h \ - sip-sec-krb5.c \ + sip-sec-gssapi.h \ + sip-sec-gssapi.c \ sip-sec-negotiate.h \ sip-sec-negotiate.c libsipe_core_la_CFLAGS += $(KRB5_CFLAGS) diff --git a/src/core/sip-sec-krb5.c b/src/core/sip-sec-gssapi.c similarity index 99% rename from src/core/sip-sec-krb5.c rename to src/core/sip-sec-gssapi.c index 4788291c..52cb47df 100644 --- a/src/core/sip-sec-krb5.c +++ b/src/core/sip-sec-gssapi.c @@ -1,5 +1,5 @@ /** - * @file sip-sec-krb5.c + * @file sip-sec-gssapi.c * * pidgin-sipe * @@ -37,7 +37,7 @@ #include "sipe-common.h" #include "sip-sec.h" #include "sip-sec-mech.h" -#include "sip-sec-krb5.h" +#include "sip-sec-gssapi.h" #include "sipe-backend.h" #include "sipe-utils.h" diff --git a/src/core/sip-sec-krb5.h b/src/core/sip-sec-gssapi.h similarity index 97% rename from src/core/sip-sec-krb5.h rename to src/core/sip-sec-gssapi.h index dee191d5..9fadb2a9 100644 --- a/src/core/sip-sec-krb5.h +++ b/src/core/sip-sec-gssapi.h @@ -1,5 +1,5 @@ /** - * @file sip-sec-krb5.h + * @file sip-sec-gssapi.h * * pidgin-sipe * diff --git a/src/core/sip-sec-negotiate.c b/src/core/sip-sec-negotiate.c index 14ddb863..dedf6642 100644 --- a/src/core/sip-sec-negotiate.c +++ b/src/core/sip-sec-negotiate.c @@ -30,7 +30,7 @@ #include "sipe-common.h" #include "sip-sec.h" #include "sip-sec-mech.h" -#include "sip-sec-krb5.h" +#include "sip-sec-gssapi.h" /* for Kerberos */ #include "sip-sec-negotiate.h" #include "sip-sec-ntlm.h" #include "sipe-backend.h" diff --git a/src/core/sip-sec.c b/src/core/sip-sec.c index 2b444370..1599fd4e 100644 --- a/src/core/sip-sec.c +++ b/src/core/sip-sec.c @@ -70,7 +70,7 @@ #define sip_sec_create_context__Kerberos sip_sec_create_context__sspi #define sip_sec_password__Kerberos sip_sec_password__sspi #elif defined(HAVE_GSSAPI_GSSAPI_H) -#include "sip-sec-krb5.h" +#include "sip-sec-gssapi.h" #define sip_sec_create_context__Kerberos sip_sec_create_context__krb5 #define sip_sec_password__Kerberos sip_sec_password__krb5 #else -- 2.11.4.GIT