d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the __DECONST macro rather than hand rolling it.

Browse Source 
Obtained from:	CheriBSD
MFC after:	1 week
Sponsored by:	DARPA, AFRL
This commit is contained in:
brooks 2019-07-19 22:54:09 +00:00
parent ab87bfcd7a
commit 57d1968322
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libgssapi/gss_accept_sec_context.c
View File

@ -100,11 +100,11 @@ parse_header(const gss_buffer_t input_token, gss_OID mech_oid)
} }
static gss_OID_desc krb5_mechanism = static gss_OID_desc krb5_mechanism =
{9, (void *)(uintptr_t) "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02"}; {9, __DECONST(void *, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02")};
static gss_OID_desc ntlm_mechanism = static gss_OID_desc ntlm_mechanism =
{10, (void *)(uintptr_t) "\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a"}; {10, __DECONST(void *, "\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a")};
static gss_OID_desc spnego_mechanism = static gss_OID_desc spnego_mechanism =
{6, (void *)(uintptr_t) "\x2b\x06\x01\x05\x05\x02"}; {6, __DECONST(void *, "\x2b\x06\x01\x05\x05\x02")};
static OM_uint32 static OM_uint32
choose_mech(const gss_buffer_t input, gss_OID mech_oid) choose_mech(const gss_buffer_t input, gss_OID mech_oid)

16
lib/libgssapi/gss_names.c
View File

@ -49,7 +49,7 @@
* to that gss_OID_desc. * to that gss_OID_desc.
*/ */
static gss_OID_desc GSS_C_NT_USER_NAME_storage = static gss_OID_desc GSS_C_NT_USER_NAME_storage =
{10, (void *)(uintptr_t)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x01"}; {10, __DECONST(void *, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x01")};
gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_storage; gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_storage;
/* /*
@ -64,7 +64,7 @@ gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_storage;
* initialized to point to that gss_OID_desc. * initialized to point to that gss_OID_desc.
*/ */
static gss_OID_desc GSS_C_NT_MACHINE_UID_NAME_storage = static gss_OID_desc GSS_C_NT_MACHINE_UID_NAME_storage =
{10, (void *)(uintptr_t)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x02"}; {10, __DECONST(void *, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x02")};
gss_OID GSS_C_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHINE_UID_NAME_storage; gss_OID GSS_C_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHINE_UID_NAME_storage;
/* /*
@ -79,7 +79,7 @@ gss_OID GSS_C_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHINE_UID_NAME_storage;
* initialized to point to that gss_OID_desc. * initialized to point to that gss_OID_desc.
*/ */
static gss_OID_desc GSS_C_NT_STRING_UID_NAME_storage = static gss_OID_desc GSS_C_NT_STRING_UID_NAME_storage =
{10, (void *)(uintptr_t)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x03"}; {10, __DECONST(void *, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x03")};
gss_OID GSS_C_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_storage; gss_OID GSS_C_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_storage;
/* /*
@ -100,7 +100,7 @@ gss_OID GSS_C_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_storage;
* implementations * implementations
*/ */
static gss_OID_desc GSS_C_NT_HOSTBASED_SERVICE_X_storage = static gss_OID_desc GSS_C_NT_HOSTBASED_SERVICE_X_storage =
{6, (void *)(uintptr_t)"\x2b\x06\x01\x05\x06\x02"}; {6, __DECONST(void *, "\x2b\x06\x01\x05\x06\x02")};
gss_OID GSS_C_NT_HOSTBASED_SERVICE_X = &GSS_C_NT_HOSTBASED_SERVICE_X_storage; gss_OID GSS_C_NT_HOSTBASED_SERVICE_X = &GSS_C_NT_HOSTBASED_SERVICE_X_storage;
/* /*
@ -115,7 +115,7 @@ gss_OID GSS_C_NT_HOSTBASED_SERVICE_X = &GSS_C_NT_HOSTBASED_SERVICE_X_storage;
* to point to that gss_OID_desc. * to point to that gss_OID_desc.
*/ */
static gss_OID_desc GSS_C_NT_HOSTBASED_SERVICE_storage = static gss_OID_desc GSS_C_NT_HOSTBASED_SERVICE_storage =
{10, (void *)(uintptr_t)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x04"}; {10, __DECONST(void *, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x01\x04")};
gss_OID GSS_C_NT_HOSTBASED_SERVICE = &GSS_C_NT_HOSTBASED_SERVICE_storage; gss_OID GSS_C_NT_HOSTBASED_SERVICE = &GSS_C_NT_HOSTBASED_SERVICE_storage;
/* /*
@ -129,7 +129,7 @@ gss_OID GSS_C_NT_HOSTBASED_SERVICE = &GSS_C_NT_HOSTBASED_SERVICE_storage;
* to that gss_OID_desc. * to that gss_OID_desc.
*/ */
static gss_OID_desc GSS_C_NT_ANONYMOUS_storage = static gss_OID_desc GSS_C_NT_ANONYMOUS_storage =
{6, (void *)(uintptr_t)"\x2b\x06\01\x05\x06\x03"}; {6, __DECONST(void *, "\x2b\x06\01\x05\x06\x03")};
gss_OID GSS_C_NT_ANONYMOUS = &GSS_C_NT_ANONYMOUS_storage; gss_OID GSS_C_NT_ANONYMOUS = &GSS_C_NT_ANONYMOUS_storage;
/* /*
@ -143,7 +143,7 @@ gss_OID GSS_C_NT_ANONYMOUS = &GSS_C_NT_ANONYMOUS_storage;
* to that gss_OID_desc. * to that gss_OID_desc.
*/ */
static gss_OID_desc GSS_C_NT_EXPORT_NAME_storage = static gss_OID_desc GSS_C_NT_EXPORT_NAME_storage =
{6, (void *)(uintptr_t)"\x2b\x06\x01\x05\x06\x04"}; {6, __DECONST(void *, "\x2b\x06\x01\x05\x06\x04")};
gss_OID GSS_C_NT_EXPORT_NAME = &GSS_C_NT_EXPORT_NAME_storage; gss_OID GSS_C_NT_EXPORT_NAME = &GSS_C_NT_EXPORT_NAME_storage;
/* /*
@ -153,7 +153,7 @@ gss_OID GSS_C_NT_EXPORT_NAME = &GSS_C_NT_EXPORT_NAME_storage;
* is "GSS_KRB5_NT_PRINCIPAL_NAME". * is "GSS_KRB5_NT_PRINCIPAL_NAME".
*/ */
static gss_OID_desc GSS_KRB5_NT_PRINCIPAL_NAME_storage = static gss_OID_desc GSS_KRB5_NT_PRINCIPAL_NAME_storage =
{10, (void *)(uintptr_t)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x01"}; {10, __DECONST(void *, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x01")};
gss_OID GSS_KRB5_NT_PRINCIPAL_NAME = &GSS_KRB5_NT_PRINCIPAL_NAME_storage; gss_OID GSS_KRB5_NT_PRINCIPAL_NAME = &GSS_KRB5_NT_PRINCIPAL_NAME_storage;
/* /*