From b4a53360398fd9c18d06b8aaf5ff34ccee19f8cd Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:15:02 +0000 Subject: [PATCH] kgssapi: clean up empty lines in .c and .h files --- sys/kgssapi/gss_canonicalize_name.c | 2 +- sys/kgssapi/gss_delete_sec_context.c | 2 +- sys/kgssapi/gss_display_status.c | 2 +- sys/kgssapi/gss_get_mic.c | 1 - sys/kgssapi/gss_import_name.c | 2 +- sys/kgssapi/gss_names.c | 2 -- sys/kgssapi/gss_release_buffer.c | 1 - sys/kgssapi/gss_release_name.c | 2 +- sys/kgssapi/gss_unwrap.c | 1 - sys/kgssapi/gss_verify_mic.c | 1 - sys/kgssapi/gssapi.h | 1 - sys/kgssapi/gsstest.c | 6 ++---- sys/kgssapi/krb5/kcrypto_aes.c | 2 +- sys/kgssapi/krb5/krb5_mech.c | 5 ++--- 14 files changed, 10 insertions(+), 20 deletions(-) diff --git a/sys/kgssapi/gss_canonicalize_name.c b/sys/kgssapi/gss_canonicalize_name.c index f3af222d549d..b1e2f9fe81b8 100644 --- a/sys/kgssapi/gss_canonicalize_name.c +++ b/sys/kgssapi/gss_canonicalize_name.c @@ -61,7 +61,7 @@ gss_canonicalize_name(OM_uint32 *minor_status, args.input_name = input_name->handle; args.mech_type = mech_type; - + bzero(&res, sizeof(res)); stat = gssd_canonicalize_name_1(&args, &res, cl); CLNT_RELEASE(cl); diff --git a/sys/kgssapi/gss_delete_sec_context.c b/sys/kgssapi/gss_delete_sec_context.c index 883909a84577..4d520feb71b9 100644 --- a/sys/kgssapi/gss_delete_sec_context.c +++ b/sys/kgssapi/gss_delete_sec_context.c @@ -70,7 +70,7 @@ gss_delete_sec_context(OM_uint32 *minor_status, gss_ctx_id_t *context_handle, cl = kgss_gssd_client(); if (cl == NULL) return (GSS_S_FAILURE); - + bzero(&res, sizeof(res)); stat = gssd_delete_sec_context_1(&args, &res, cl); CLNT_RELEASE(cl); diff --git a/sys/kgssapi/gss_display_status.c b/sys/kgssapi/gss_display_status.c index 80ba1d8a5d87..6809bc352b11 100644 --- a/sys/kgssapi/gss_display_status.c +++ b/sys/kgssapi/gss_display_status.c @@ -64,7 +64,7 @@ gss_display_status(OM_uint32 *minor_status, args.status_type = status_type; args.mech_type = mech_type; args.message_context = *message_context; - + bzero(&res, sizeof(res)); stat = gssd_display_status_1(&args, &res, cl); CLNT_RELEASE(cl); diff --git a/sys/kgssapi/gss_get_mic.c b/sys/kgssapi/gss_get_mic.c index ab8dcab3a401..f454daea9399 100644 --- a/sys/kgssapi/gss_get_mic.c +++ b/sys/kgssapi/gss_get_mic.c @@ -88,4 +88,3 @@ gss_get_mic_mbuf(OM_uint32 *minor_status, const gss_ctx_id_t ctx, return (KGSS_GET_MIC(ctx, minor_status, qop_req, m, micp)); } - diff --git a/sys/kgssapi/gss_import_name.c b/sys/kgssapi/gss_import_name.c index 4bed965f190c..7200cc90354e 100644 --- a/sys/kgssapi/gss_import_name.c +++ b/sys/kgssapi/gss_import_name.c @@ -63,7 +63,7 @@ gss_import_name(OM_uint32 *minor_status, args.input_name_buffer = *input_name_buffer; args.input_name_type = input_name_type; - + bzero(&res, sizeof(res)); stat = gssd_import_name_1(&args, &res, cl); CLNT_RELEASE(cl); diff --git a/sys/kgssapi/gss_names.c b/sys/kgssapi/gss_names.c index 373c4bb4ebcd..5672f049a3e3 100644 --- a/sys/kgssapi/gss_names.c +++ b/sys/kgssapi/gss_names.c @@ -174,5 +174,3 @@ gss_OID GSS_KRB5_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHINE_UID_NAME_storage; * this type is "GSS_KRB5_NT_STRING_UID_NAME". */ gss_OID GSS_KRB5_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_storage; - - diff --git a/sys/kgssapi/gss_release_buffer.c b/sys/kgssapi/gss_release_buffer.c index 6777b005bab3..6082b22ae0b3 100644 --- a/sys/kgssapi/gss_release_buffer.c +++ b/sys/kgssapi/gss_release_buffer.c @@ -51,4 +51,3 @@ gss_release_buffer(OM_uint32 *minor_status, gss_buffer_t buffer) return (GSS_S_COMPLETE); } - diff --git a/sys/kgssapi/gss_release_name.c b/sys/kgssapi/gss_release_name.c index 323594b35852..16050226cc8c 100644 --- a/sys/kgssapi/gss_release_name.c +++ b/sys/kgssapi/gss_release_name.c @@ -59,7 +59,7 @@ gss_release_name(OM_uint32 *minor_status, gss_name_t *input_name) if (*input_name) { name = *input_name; args.input_name = name->handle; - + cl = kgss_gssd_client(); if (cl == NULL) return (GSS_S_FAILURE); diff --git a/sys/kgssapi/gss_unwrap.c b/sys/kgssapi/gss_unwrap.c index 4bd2f89e538e..7bcefd0f2493 100644 --- a/sys/kgssapi/gss_unwrap.c +++ b/sys/kgssapi/gss_unwrap.c @@ -96,4 +96,3 @@ gss_unwrap_mbuf(OM_uint32 *minor_status, return (KGSS_UNWRAP(ctx, minor_status, mp, conf_state, qop_state)); } - diff --git a/sys/kgssapi/gss_verify_mic.c b/sys/kgssapi/gss_verify_mic.c index c5c233bb9bc1..45b8c18f2000 100644 --- a/sys/kgssapi/gss_verify_mic.c +++ b/sys/kgssapi/gss_verify_mic.c @@ -86,4 +86,3 @@ gss_verify_mic_mbuf(OM_uint32 *minor_status, const gss_ctx_id_t ctx, return (KGSS_VERIFY_MIC(ctx, minor_status, m, mic, qop_state)); } - diff --git a/sys/kgssapi/gssapi.h b/sys/kgssapi/gssapi.h index c8f86c6ec555..a7856ed276cc 100644 --- a/sys/kgssapi/gssapi.h +++ b/sys/kgssapi/gssapi.h @@ -249,7 +249,6 @@ extern gss_OID GSS_C_NT_HOSTBASED_SERVICE; */ extern gss_OID GSS_C_NT_ANONYMOUS; - /* * The implementation must reserve static storage for a * gss_OID_desc object containing the value diff --git a/sys/kgssapi/gsstest.c b/sys/kgssapi/gsstest.c index 7e57c98d87f5..4a7710730e0d 100644 --- a/sys/kgssapi/gsstest.c +++ b/sys/kgssapi/gsstest.c @@ -375,7 +375,7 @@ gsstest_1(struct thread *td) || memcmp(message_buf.value, server_token.value, message_buf.length)) printf("unwrap result corrupt\n"); - + gss_release_buffer(&min_stat, &client_token); gss_release_buffer(&min_stat, &server_token); @@ -429,7 +429,6 @@ gsstest_2(struct thread *td, int step, const gss_buffer_t input_token, maj_stat = GSS_S_FAILURE; min_stat = 0; switch (step) { - case 1: if (server_context == GSS_C_NO_CONTEXT) { static char sbuf[512]; @@ -565,7 +564,7 @@ gsstest_2(struct thread *td, int step, const gss_buffer_t input_token, *maj_stat_res = maj_stat; *min_stat_res = min_stat; return (0); - + out: *maj_stat_res = maj_stat; *min_stat_res = min_stat; @@ -1127,7 +1126,6 @@ static int gsstest_offset = NO_SYSCALL; * The function called at load/unload. */ - static int gsstest_load(struct module *module, int cmd, void *arg) { diff --git a/sys/kgssapi/krb5/kcrypto_aes.c b/sys/kgssapi/krb5/kcrypto_aes.c index 04b68357be73..38faeb37066c 100644 --- a/sys/kgssapi/krb5/kcrypto_aes.c +++ b/sys/kgssapi/krb5/kcrypto_aes.c @@ -121,7 +121,7 @@ aes_crypto_cb(struct cryptop *crp) { int error; struct aes_state *as = (struct aes_state *) crp->crp_opaque; - + if (crypto_ses2caps(crp->crp_session) & CRYPTOCAP_F_SYNC) return (0); diff --git a/sys/kgssapi/krb5/krb5_mech.c b/sys/kgssapi/krb5/krb5_mech.c index ecec8d6b86f9..bc8d9128bc32 100644 --- a/sys/kgssapi/krb5/krb5_mech.c +++ b/sys/kgssapi/krb5/krb5_mech.c @@ -414,7 +414,7 @@ krb5_import(gss_ctx_id_t ctx, size_t len = context_token->length; uint32_t flags; int i; - + /* * We support heimdal 0.6 and heimdal 1.1 */ @@ -899,7 +899,7 @@ krb5_get_mic_old(struct krb5_context *kc, struct mbuf *m, mic->m_next = NULL; mlast->m_next = NULL; m_free(tm); - + /* * SND_SEQ: * @@ -2114,7 +2114,6 @@ kgssapi_krb5_modevent(module_t mod, int type, void *data) break; } - return (0); } static moduledata_t kgssapi_krb5_mod = {