From 6a0bc4f5cd46b1ab85dba5bd2de28f568cc947b0 Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Sun, 8 May 2016 02:31:00 -0400 Subject: Implement unique ccache names Unique ccache names may be requested using the GssapiDelegCcacheUnique configuration option. This option is off by default. If both unique ccache names and session use are enabled, then a mechanism for removing old ccaches must be supplied. Signed-off-by: Robbie Harwood Also-authored-by: Petr Vobornik Reviewed-by: Simo Sorce --- src/asn1c/GSSSessionData.c | 17 +++++++++++++---- src/asn1c/GSSSessionData.h | 2 +- src/asn1c/Uint32.c | 1 - src/asn1c/Uint32.h | 1 - src/asn1c/session.asn1 | 3 ++- 5 files changed, 16 insertions(+), 8 deletions(-) (limited to 'src/asn1c') diff --git a/src/asn1c/GSSSessionData.c b/src/asn1c/GSSSessionData.c index 12a98e3..f0dcc2e 100644 --- a/src/asn1c/GSSSessionData.c +++ b/src/asn1c/GSSSessionData.c @@ -2,7 +2,6 @@ * Generated by asn1c-0.9.27 (http://lionet.info/asn1c) * From ASN.1 module "GssapiSessionModule" * found in "session.asn1" - * `asn1c -fskeletons-copy` */ #include "GSSSessionData.h" @@ -62,6 +61,15 @@ static asn_TYPE_member_t asn_MBR_GSSSessionData_1[] = { 0, "basichash" }, + { ATF_NOFLAGS, 0, offsetof(struct GSSSessionData, ccname), + (ASN_TAG_CLASS_CONTEXT | (6 << 2)), + +1, /* EXPLICIT tag at current level */ + &asn_DEF_OCTET_STRING, + 0, /* Defer constraints checking to the member type */ + 0, /* PER is not compiled, use -gen-PER */ + 0, + "ccname" + }, }; static ber_tlv_tag_t asn_DEF_GSSSessionData_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) @@ -72,13 +80,14 @@ static asn_TYPE_tag2member_t asn_MAP_GSSSessionData_tag2el_1[] = { { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* expiration */ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 }, /* username */ { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 4, 0, 0 }, /* gssname */ - { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 } /* basichash */ + { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* basichash */ + { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 } /* ccname */ }; static asn_SEQUENCE_specifics_t asn_SPC_GSSSessionData_specs_1 = { sizeof(struct GSSSessionData), offsetof(struct GSSSessionData, _asn_ctx), asn_MAP_GSSSessionData_tag2el_1, - 6, /* Count of tags in the map */ + 7, /* Count of tags in the map */ 0, 0, 0, /* Optional elements (not needed) */ -1, /* Start extensions */ -1 /* Stop extensions */ @@ -103,7 +112,7 @@ asn_TYPE_descriptor_t asn_DEF_GSSSessionData = { /sizeof(asn_DEF_GSSSessionData_tags_1[0]), /* 1 */ 0, /* No PER visible constraints */ asn_MBR_GSSSessionData_1, - 6, /* Elements count */ + 7, /* Elements count */ &asn_SPC_GSSSessionData_specs_1 /* Additional specs */ }; diff --git a/src/asn1c/GSSSessionData.h b/src/asn1c/GSSSessionData.h index 53556d8..4ae224f 100644 --- a/src/asn1c/GSSSessionData.h +++ b/src/asn1c/GSSSessionData.h @@ -2,7 +2,6 @@ * Generated by asn1c-0.9.27 (http://lionet.info/asn1c) * From ASN.1 module "GssapiSessionModule" * found in "session.asn1" - * `asn1c -fskeletons-copy` */ #ifndef _GSSSessionData_H_ @@ -29,6 +28,7 @@ typedef struct GSSSessionData { OCTET_STRING_t username; OCTET_STRING_t gssname; OCTET_STRING_t basichash; + OCTET_STRING_t ccname; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; diff --git a/src/asn1c/Uint32.c b/src/asn1c/Uint32.c index 794f98b..f5d125a 100644 --- a/src/asn1c/Uint32.c +++ b/src/asn1c/Uint32.c @@ -2,7 +2,6 @@ * Generated by asn1c-0.9.27 (http://lionet.info/asn1c) * From ASN.1 module "GssapiSessionModule" * found in "session.asn1" - * `asn1c -fskeletons-copy` */ #include "Uint32.h" diff --git a/src/asn1c/Uint32.h b/src/asn1c/Uint32.h index a0ed876..436e26e 100644 --- a/src/asn1c/Uint32.h +++ b/src/asn1c/Uint32.h @@ -2,7 +2,6 @@ * Generated by asn1c-0.9.27 (http://lionet.info/asn1c) * From ASN.1 module "GssapiSessionModule" * found in "session.asn1" - * `asn1c -fskeletons-copy` */ #ifndef _Uint32_H_ diff --git a/src/asn1c/session.asn1 b/src/asn1c/session.asn1 index 1762812..f499779 100644 --- a/src/asn1c/session.asn1 +++ b/src/asn1c/session.asn1 @@ -8,6 +8,7 @@ GssapiSessionModule DEFINITIONS ::= BEGIN expiration [2] Uint32, username [3] OCTET STRING, gssname [4] OCTET STRING, - basichash [5] OCTET STRING + basichash [5] OCTET STRING, + ccname [6] OCTET STRING } END -- cgit