Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patch from Alejandro Sedeno, somewhat modified by me, which
reorganises the GSSAPI support so that it handles alternative implementations of the GSS-API. In particular, this means PuTTY can now talk to MIT Kerberos for Windows instead of being limited to SSPI. I don't know for sure whether further tweaking will be needed (to the UI, most likely, or to automatic selection of credentials), but testing reports suggest it's now at least worth committing to trunk to get it more widely tested. [originally from svn r8952]
- Loading branch information
Showing
21 changed files
with
1,140 additions
and
295 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| /* | ||
| * Stub definitions of the GSSAPI library list, for Unix pterm and | ||
| * any other application that needs the symbols defined but has no | ||
| * use for them. | ||
| */ | ||
|
|
||
| const int ngsslibs = 0; | ||
| const char *const gsslibnames[1] = { "dummy" }; | ||
| const char *const gsslibkeywords[1] = { "dummy" }; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* This file actually defines the GSSAPI function pointers for | ||
| * functions we plan to import from a GSSAPI library. | ||
| */ | ||
| #include "putty.h" | ||
|
|
||
| #ifndef NO_GSSAPI | ||
|
|
||
| #include "pgssapi.h" | ||
|
|
||
| #ifndef NO_LIBDL | ||
|
|
||
| /* Reserved static storage for GSS_oids. Comments are quotes from RFC 2744. */ | ||
| static const gss_OID_desc oids[] = { | ||
| /* The implementation must reserve static storage for a | ||
| * gss_OID_desc object containing the value */ | ||
| {10, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x01"}, | ||
| /* corresponding to an object-identifier value of | ||
| * {iso(1) member-body(2) United States(840) mit(113554) | ||
| * infosys(1) gssapi(2) generic(1) user_name(1)}. The constant | ||
| * GSS_C_NT_USER_NAME should be initialized to point | ||
| * to that gss_OID_desc. | ||
| * The implementation must reserve static storage for a | ||
| * gss_OID_desc object containing the value */ | ||
| {10, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x02"}, | ||
| /* corresponding to an object-identifier value of | ||
| * {iso(1) member-body(2) United States(840) mit(113554) | ||
| * infosys(1) gssapi(2) generic(1) machine_uid_name(2)}. | ||
| * The constant GSS_C_NT_MACHINE_UID_NAME should be | ||
| * initialized to point to that gss_OID_desc. | ||
| * The implementation must reserve static storage for a | ||
| * gss_OID_desc object containing the value */ | ||
| {10, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x03"}, | ||
| /* corresponding to an object-identifier value of | ||
| * {iso(1) member-body(2) United States(840) mit(113554) | ||
| * infosys(1) gssapi(2) generic(1) string_uid_name(3)}. | ||
| * The constant GSS_C_NT_STRING_UID_NAME should be | ||
| * initialized to point to that gss_OID_desc. | ||
| * | ||
| * The implementation must reserve static storage for a | ||
| * gss_OID_desc object containing the value */ | ||
| {6, (void *)"\x2b\x06\x01\x05\x06\x02"}, | ||
| /* corresponding to an object-identifier value of | ||
| * {iso(1) org(3) dod(6) internet(1) security(5) | ||
| * nametypes(6) gss-host-based-services(2)). The constant | ||
| * GSS_C_NT_HOSTBASED_SERVICE_X should be initialized to point | ||
| * to that gss_OID_desc. This is a deprecated OID value, and | ||
| * implementations wishing to support hostbased-service names | ||
| * should instead use the GSS_C_NT_HOSTBASED_SERVICE OID, | ||
| * defined below, to identify such names; | ||
| * GSS_C_NT_HOSTBASED_SERVICE_X should be accepted a synonym | ||
| * for GSS_C_NT_HOSTBASED_SERVICE when presented as an input | ||
| * parameter, but should not be emitted by GSS-API | ||
| * implementations | ||
| * | ||
| * The implementation must reserve static storage for a | ||
| * gss_OID_desc object containing the value */ | ||
| {10, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x04"}, | ||
| /* corresponding to an object-identifier value of {iso(1) | ||
| * member-body(2) Unites States(840) mit(113554) infosys(1) | ||
| * gssapi(2) generic(1) service_name(4)}. The constant | ||
| * GSS_C_NT_HOSTBASED_SERVICE should be initialized | ||
| * to point to that gss_OID_desc. | ||
| * | ||
| * The implementation must reserve static storage for a | ||
| * gss_OID_desc object containing the value */ | ||
| {6, (void *)"\x2b\x06\01\x05\x06\x03"}, | ||
| /* corresponding to an object identifier value of | ||
| * {1(iso), 3(org), 6(dod), 1(internet), 5(security), | ||
| * 6(nametypes), 3(gss-anonymous-name)}. The constant | ||
| * and GSS_C_NT_ANONYMOUS should be initialized to point | ||
| * to that gss_OID_desc. | ||
| * | ||
| * The implementation must reserve static storage for a | ||
| * gss_OID_desc object containing the value */ | ||
| {6, (void *)"\x2b\x06\x01\x05\x06\x04"}, | ||
| /* corresponding to an object-identifier value of | ||
| * {1(iso), 3(org), 6(dod), 1(internet), 5(security), | ||
| * 6(nametypes), 4(gss-api-exported-name)}. The constant | ||
| * GSS_C_NT_EXPORT_NAME should be initialized to point | ||
| * to that gss_OID_desc. | ||
| */ | ||
| }; | ||
|
|
||
| /* Here are the constants which point to the static structure above. | ||
| * | ||
| * Constants of the form GSS_C_NT_* are specified by rfc 2744. | ||
| */ | ||
| const_gss_OID GSS_C_NT_USER_NAME = oids+0; | ||
| const_gss_OID GSS_C_NT_MACHINE_UID_NAME = oids+1; | ||
| const_gss_OID GSS_C_NT_STRING_UID_NAME = oids+2; | ||
| const_gss_OID GSS_C_NT_HOSTBASED_SERVICE_X = oids+3; | ||
| const_gss_OID GSS_C_NT_HOSTBASED_SERVICE = oids+4; | ||
| const_gss_OID GSS_C_NT_ANONYMOUS = oids+5; | ||
| const_gss_OID GSS_C_NT_EXPORT_NAME = oids+6; | ||
|
|
||
| #endif /* NO_LIBDL */ | ||
|
|
||
| static gss_OID_desc gss_mech_krb5_desc = | ||
| { 9, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02" }; | ||
| /* iso(1) member-body(2) United States(840) mit(113554) infosys(1) gssapi(2) krb5(2)*/ | ||
| const gss_OID GSS_MECH_KRB5 = &gss_mech_krb5_desc; | ||
|
|
||
| #endif /* NO_GSSAPI */ |
Oops, something went wrong.