From owner-svn-src-all@freebsd.org Tue Sep 1 22:15:05 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D397E37FA0A; Tue, 1 Sep 2020 22:15:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh1bF5MJbz3V8c; Tue, 1 Sep 2020 22:15:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9C12C202DB; Tue, 1 Sep 2020 22:15:05 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081MF5iD063340; Tue, 1 Sep 2020 22:15:05 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081MF2dT063323; Tue, 1 Sep 2020 22:15:02 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012215.081MF2dT063323@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 22:15:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365229 - in head/sys/kgssapi: . krb5 X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/kgssapi: . krb5 X-SVN-Commit-Revision: 365229 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 22:15:05 -0000 Author: mjg Date: Tue Sep 1 22:15:02 2020 New Revision: 365229 URL: https://svnweb.freebsd.org/changeset/base/365229 Log: kgssapi: clean up empty lines in .c and .h files Modified: head/sys/kgssapi/gss_canonicalize_name.c head/sys/kgssapi/gss_delete_sec_context.c head/sys/kgssapi/gss_display_status.c head/sys/kgssapi/gss_get_mic.c head/sys/kgssapi/gss_import_name.c head/sys/kgssapi/gss_names.c head/sys/kgssapi/gss_release_buffer.c head/sys/kgssapi/gss_release_name.c head/sys/kgssapi/gss_unwrap.c head/sys/kgssapi/gss_verify_mic.c head/sys/kgssapi/gssapi.h head/sys/kgssapi/gsstest.c head/sys/kgssapi/krb5/kcrypto_aes.c head/sys/kgssapi/krb5/krb5_mech.c Modified: head/sys/kgssapi/gss_canonicalize_name.c ============================================================================== --- head/sys/kgssapi/gss_canonicalize_name.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_canonicalize_name.c Tue Sep 1 22:15:02 2020 (r365229) @@ -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); Modified: head/sys/kgssapi/gss_delete_sec_context.c ============================================================================== --- head/sys/kgssapi/gss_delete_sec_context.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_delete_sec_context.c Tue Sep 1 22:15:02 2020 (r365229) @@ -70,7 +70,7 @@ gss_delete_sec_context(OM_uint32 *minor_status, gss_ct 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); Modified: head/sys/kgssapi/gss_display_status.c ============================================================================== --- head/sys/kgssapi/gss_display_status.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_display_status.c Tue Sep 1 22:15:02 2020 (r365229) @@ -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); Modified: head/sys/kgssapi/gss_get_mic.c ============================================================================== --- head/sys/kgssapi/gss_get_mic.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_get_mic.c Tue Sep 1 22:15:02 2020 (r365229) @@ -88,4 +88,3 @@ gss_get_mic_mbuf(OM_uint32 *minor_status, const gss_ct return (KGSS_GET_MIC(ctx, minor_status, qop_req, m, micp)); } - Modified: head/sys/kgssapi/gss_import_name.c ============================================================================== --- head/sys/kgssapi/gss_import_name.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_import_name.c Tue Sep 1 22:15:02 2020 (r365229) @@ -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); Modified: head/sys/kgssapi/gss_names.c ============================================================================== --- head/sys/kgssapi/gss_names.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_names.c Tue Sep 1 22:15:02 2020 (r365229) @@ -174,5 +174,3 @@ gss_OID GSS_KRB5_NT_MACHINE_UID_NAME = &GSS_C_NT_MACHI * this type is "GSS_KRB5_NT_STRING_UID_NAME". */ gss_OID GSS_KRB5_NT_STRING_UID_NAME = &GSS_C_NT_STRING_UID_NAME_storage; - - Modified: head/sys/kgssapi/gss_release_buffer.c ============================================================================== --- head/sys/kgssapi/gss_release_buffer.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_release_buffer.c Tue Sep 1 22:15:02 2020 (r365229) @@ -51,4 +51,3 @@ gss_release_buffer(OM_uint32 *minor_status, gss_buffer return (GSS_S_COMPLETE); } - Modified: head/sys/kgssapi/gss_release_name.c ============================================================================== --- head/sys/kgssapi/gss_release_name.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_release_name.c Tue Sep 1 22:15:02 2020 (r365229) @@ -59,7 +59,7 @@ gss_release_name(OM_uint32 *minor_status, gss_name_t * if (*input_name) { name = *input_name; args.input_name = name->handle; - + cl = kgss_gssd_client(); if (cl == NULL) return (GSS_S_FAILURE); Modified: head/sys/kgssapi/gss_unwrap.c ============================================================================== --- head/sys/kgssapi/gss_unwrap.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_unwrap.c Tue Sep 1 22:15:02 2020 (r365229) @@ -96,4 +96,3 @@ gss_unwrap_mbuf(OM_uint32 *minor_status, return (KGSS_UNWRAP(ctx, minor_status, mp, conf_state, qop_state)); } - Modified: head/sys/kgssapi/gss_verify_mic.c ============================================================================== --- head/sys/kgssapi/gss_verify_mic.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gss_verify_mic.c Tue Sep 1 22:15:02 2020 (r365229) @@ -86,4 +86,3 @@ gss_verify_mic_mbuf(OM_uint32 *minor_status, const gss return (KGSS_VERIFY_MIC(ctx, minor_status, m, mic, qop_state)); } - Modified: head/sys/kgssapi/gssapi.h ============================================================================== --- head/sys/kgssapi/gssapi.h Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gssapi.h Tue Sep 1 22:15:02 2020 (r365229) @@ -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 Modified: head/sys/kgssapi/gsstest.c ============================================================================== --- head/sys/kgssapi/gsstest.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/gsstest.c Tue Sep 1 22:15:02 2020 (r365229) @@ -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_buffe 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_buffe *maj_stat_res = maj_stat; *min_stat_res = min_stat; return (0); - + out: *maj_stat_res = maj_stat; *min_stat_res = min_stat; @@ -1126,7 +1125,6 @@ static int gsstest_offset = NO_SYSCALL; /* * The function called at load/unload. */ - static int gsstest_load(struct module *module, int cmd, void *arg) Modified: head/sys/kgssapi/krb5/kcrypto_aes.c ============================================================================== --- head/sys/kgssapi/krb5/kcrypto_aes.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/krb5/kcrypto_aes.c Tue Sep 1 22:15:02 2020 (r365229) @@ -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); Modified: head/sys/kgssapi/krb5/krb5_mech.c ============================================================================== --- head/sys/kgssapi/krb5/krb5_mech.c Tue Sep 1 22:14:52 2020 (r365228) +++ head/sys/kgssapi/krb5/krb5_mech.c Tue Sep 1 22:15:02 2020 (r365229) @@ -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 mic->m_next = NULL; mlast->m_next = NULL; m_free(tm); - + /* * SND_SEQ: * @@ -2113,7 +2113,6 @@ kgssapi_krb5_modevent(module_t mod, int type, void *da kgss_uninstall_mech(&krb5_mech_oid); break; } - return (0); }