diff options
| author | Günther Deschner <gd@samba.org> | 2008-10-22 14:01:53 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2008-10-22 21:37:36 +0200 |
| commit | cef97c245955d0f125928740cd89984100635d29 (patch) | |
| tree | 8cac7eb3420243e93d362ee11451de90ac6f597b | |
| parent | 5d805425b9382e3aabda4218ffa68584a2a58c9f (diff) | |
| download | samba-cef97c245955d0f125928740cd89984100635d29.tar.gz samba-cef97c245955d0f125928740cd89984100635d29.tar.bz2 samba-cef97c245955d0f125928740cd89984100635d29.zip | |
s3-spnego: move spnego defines to spnego.h
Guenther
| -rw-r--r-- | source3/include/asn_1.h | 17 | ||||
| -rw-r--r-- | source3/include/spnego.h | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/source3/include/asn_1.h b/source3/include/asn_1.h index dd345cd601..b9bade2db9 100644 --- a/source3/include/asn_1.h +++ b/source3/include/asn_1.h @@ -51,21 +51,4 @@ typedef struct asn1_data { #define ASN1_MAX_OIDS 20 -/* some well known object IDs */ -#define OID_SPNEGO "1 3 6 1 5 5 2" -#define OID_NTLMSSP "1 3 6 1 4 1 311 2 2 10" -#define OID_KERBEROS5_OLD "1 2 840 48018 1 2 2" -#define OID_KERBEROS5 "1 2 840 113554 1 2 2" - -#define SPNEGO_NEG_RESULT_ACCEPT 0 -#define SPNEGO_NEG_RESULT_INCOMPLETE 1 -#define SPNEGO_NEG_RESULT_REJECT 2 - -/* not really ASN.1, but RFC 1964 */ -#define TOK_ID_KRB_AP_REQ (uchar*)"\x01\x00" -#define TOK_ID_KRB_AP_REP (uchar*)"\x02\x00" -#define TOK_ID_KRB_ERROR (uchar*)"\x03\x00" -#define TOK_ID_GSS_GETMIC (uchar*)"\x01\x01" -#define TOK_ID_GSS_WRAP (uchar*)"\x02\x01" - #endif /* _ASN_1_H */ diff --git a/source3/include/spnego.h b/source3/include/spnego.h index 02921ed18e..c939f0e14e 100644 --- a/source3/include/spnego.h +++ b/source3/include/spnego.h @@ -35,6 +35,23 @@ #define SPNEGO_NEG_TOKEN_INIT 0 #define SPNEGO_NEG_TOKEN_TARG 1 +/* some well known object IDs */ +#define OID_SPNEGO "1 3 6 1 5 5 2" +#define OID_NTLMSSP "1 3 6 1 4 1 311 2 2 10" +#define OID_KERBEROS5_OLD "1 2 840 48018 1 2 2" +#define OID_KERBEROS5 "1 2 840 113554 1 2 2" + +#define SPNEGO_NEG_RESULT_ACCEPT 0 +#define SPNEGO_NEG_RESULT_INCOMPLETE 1 +#define SPNEGO_NEG_RESULT_REJECT 2 + +/* not really ASN.1, but RFC 1964 */ +#define TOK_ID_KRB_AP_REQ (uchar*)"\x01\x00" +#define TOK_ID_KRB_AP_REP (uchar*)"\x02\x00" +#define TOK_ID_KRB_ERROR (uchar*)"\x03\x00" +#define TOK_ID_GSS_GETMIC (uchar*)"\x01\x01" +#define TOK_ID_GSS_WRAP (uchar*)"\x02\x01" + typedef enum _spnego_negResult { SPNEGO_ACCEPT_COMPLETED = 0, SPNEGO_ACCEPT_INCOMPLETE = 1, |