[Midnightbsd-cvs] src [9988] trunk/sys/kgssapi/krb5: tag
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 26 17:57:39 EDT 2018
Revision: 9988
http://svnweb.midnightbsd.org/src/?rev=9988
Author: laffer1
Date: 2018-05-26 17:57:38 -0400 (Sat, 26 May 2018)
Log Message:
-----------
tag
Modified Paths:
--------------
trunk/sys/kgssapi/gss_accept_sec_context.c
trunk/sys/kgssapi/gss_acquire_cred.c
trunk/sys/kgssapi/gss_add_oid_set_member.c
trunk/sys/kgssapi/gss_canonicalize_name.c
trunk/sys/kgssapi/gss_create_empty_oid_set.c
trunk/sys/kgssapi/gss_delete_sec_context.c
trunk/sys/kgssapi/gss_display_status.c
trunk/sys/kgssapi/gss_export_name.c
trunk/sys/kgssapi/gss_get_mic.c
trunk/sys/kgssapi/gss_impl.c
trunk/sys/kgssapi/gss_import_name.c
trunk/sys/kgssapi/gss_init_sec_context.c
trunk/sys/kgssapi/gss_names.c
trunk/sys/kgssapi/gss_pname_to_uid.c
trunk/sys/kgssapi/gss_release_buffer.c
trunk/sys/kgssapi/gss_release_cred.c
trunk/sys/kgssapi/gss_release_name.c
trunk/sys/kgssapi/gss_release_oid_set.c
trunk/sys/kgssapi/gss_set_cred_option.c
trunk/sys/kgssapi/gss_test_oid_set_member.c
trunk/sys/kgssapi/gss_unwrap.c
trunk/sys/kgssapi/gss_verify_mic.c
trunk/sys/kgssapi/gss_wrap.c
trunk/sys/kgssapi/gss_wrap_size_limit.c
trunk/sys/kgssapi/gssapi.h
trunk/sys/kgssapi/gssapi_impl.h
trunk/sys/kgssapi/gssd.x
trunk/sys/kgssapi/gssd_prot.c
trunk/sys/kgssapi/gsstest.c
trunk/sys/kgssapi/kgss_if.m
trunk/sys/kgssapi/krb5/kcrypto.c
trunk/sys/kgssapi/krb5/kcrypto.h
trunk/sys/kgssapi/krb5/kcrypto_aes.c
trunk/sys/kgssapi/krb5/kcrypto_arcfour.c
trunk/sys/kgssapi/krb5/kcrypto_des.c
trunk/sys/kgssapi/krb5/kcrypto_des3.c
trunk/sys/kgssapi/krb5/krb5_mech.c
Property Changed:
----------------
trunk/sys/kgssapi/gssd.x
trunk/sys/kgssapi/kgss_if.m
Modified: trunk/sys/kgssapi/gss_accept_sec_context.c
===================================================================
--- trunk/sys/kgssapi/gss_accept_sec_context.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_accept_sec_context.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_accept_sec_context.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_acquire_cred.c
===================================================================
--- trunk/sys/kgssapi/gss_acquire_cred.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_acquire_cred.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_acquire_cred.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_add_oid_set_member.c
===================================================================
--- trunk/sys/kgssapi/gss_add_oid_set_member.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_add_oid_set_member.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_add_oid_set_member.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_canonicalize_name.c
===================================================================
--- trunk/sys/kgssapi/gss_canonicalize_name.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_canonicalize_name.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_canonicalize_name.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_create_empty_oid_set.c
===================================================================
--- trunk/sys/kgssapi/gss_create_empty_oid_set.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_create_empty_oid_set.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_create_empty_oid_set.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_delete_sec_context.c
===================================================================
--- trunk/sys/kgssapi/gss_delete_sec_context.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_delete_sec_context.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_delete_sec_context.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_display_status.c
===================================================================
--- trunk/sys/kgssapi/gss_display_status.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_display_status.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_display_status.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_export_name.c
===================================================================
--- trunk/sys/kgssapi/gss_export_name.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_export_name.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_export_name.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_get_mic.c
===================================================================
--- trunk/sys/kgssapi/gss_get_mic.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_get_mic.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_get_mic.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_impl.c
===================================================================
--- trunk/sys/kgssapi/gss_impl.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_impl.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_impl.c 299617 2016-05-13 08:25:06Z ngie $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -104,15 +105,20 @@
error = copyinstr(uap->path, path, sizeof(path), NULL);
if (error)
return (error);
+ if (strlen(path) + 1 > sizeof(sun.sun_path))
+ return (EINVAL);
- sun.sun_family = AF_LOCAL;
- strcpy(sun.sun_path, path);
- sun.sun_len = SUN_LEN(&sun);
-
- nconf = getnetconfigent("local");
- cl = clnt_reconnect_create(nconf,
- (struct sockaddr *) &sun, GSSD, GSSDVERS,
- RPC_MAXDATASIZE, RPC_MAXDATASIZE);
+ if (path[0] != '\0') {
+ sun.sun_family = AF_LOCAL;
+ strlcpy(sun.sun_path, path, sizeof(sun.sun_path));
+ sun.sun_len = SUN_LEN(&sun);
+
+ nconf = getnetconfigent("local");
+ cl = clnt_reconnect_create(nconf,
+ (struct sockaddr *) &sun, GSSD, GSSDVERS,
+ RPC_MAXDATASIZE, RPC_MAXDATASIZE);
+ } else
+ cl = NULL;
mtx_lock(&kgss_gssd_lock);
oldcl = kgss_gssd_handle;
@@ -286,6 +292,7 @@
switch (type) {
case MOD_LOAD:
+ rpc_gss_entries.rpc_gss_refresh_auth = rpc_gss_refresh_auth;
rpc_gss_entries.rpc_gss_secfind = rpc_gss_secfind;
rpc_gss_entries.rpc_gss_secpurge = rpc_gss_secpurge;
rpc_gss_entries.rpc_gss_seccreate = rpc_gss_seccreate;
Modified: trunk/sys/kgssapi/gss_import_name.c
===================================================================
--- trunk/sys/kgssapi/gss_import_name.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_import_name.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_import_name.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_init_sec_context.c
===================================================================
--- trunk/sys/kgssapi/gss_init_sec_context.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_init_sec_context.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_init_sec_context.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_names.c
===================================================================
--- trunk/sys/kgssapi/gss_names.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_names.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2005 Doug Rabson
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_names.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <kgssapi/gssapi.h>
Modified: trunk/sys/kgssapi/gss_pname_to_uid.c
===================================================================
--- trunk/sys/kgssapi/gss_pname_to_uid.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_pname_to_uid.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_pname_to_uid.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_release_buffer.c
===================================================================
--- trunk/sys/kgssapi/gss_release_buffer.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_release_buffer.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_release_buffer.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_release_cred.c
===================================================================
--- trunk/sys/kgssapi/gss_release_cred.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_release_cred.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_release_cred.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_release_name.c
===================================================================
--- trunk/sys/kgssapi/gss_release_name.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_release_name.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_release_name.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_release_oid_set.c
===================================================================
--- trunk/sys/kgssapi/gss_release_oid_set.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_release_oid_set.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_release_oid_set.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_set_cred_option.c
===================================================================
--- trunk/sys/kgssapi/gss_set_cred_option.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_set_cred_option.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_set_cred_option.c 244370 2012-12-18 00:25:48Z rmacklem $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_test_oid_set_member.c
===================================================================
--- trunk/sys/kgssapi/gss_test_oid_set_member.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_test_oid_set_member.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_test_oid_set_member.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_unwrap.c
===================================================================
--- trunk/sys/kgssapi/gss_unwrap.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_unwrap.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_unwrap.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_verify_mic.c
===================================================================
--- trunk/sys/kgssapi/gss_verify_mic.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_verify_mic.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_verify_mic.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_wrap.c
===================================================================
--- trunk/sys/kgssapi/gss_wrap.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_wrap.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_wrap.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gss_wrap_size_limit.c
===================================================================
--- trunk/sys/kgssapi/gss_wrap_size_limit.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gss_wrap_size_limit.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gss_wrap_size_limit.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/kernel.h>
Modified: trunk/sys/kgssapi/gssapi.h
===================================================================
--- trunk/sys/kgssapi/gssapi.h 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gssapi.h 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (C) The Internet Society (2000). All Rights Reserved.
*
@@ -25,7 +26,7 @@
* HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/kgssapi/gssapi.h 184588 2008-11-03 10:38:00Z dfr $
*/
#ifndef _KGSSAPI_GSSAPI_H_
Modified: trunk/sys/kgssapi/gssapi_impl.h
===================================================================
--- trunk/sys/kgssapi/gssapi_impl.h 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gssapi_impl.h 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/kgssapi/gssapi_impl.h 244370 2012-12-18 00:25:48Z rmacklem $
*/
#include "gssd.h"
Modified: trunk/sys/kgssapi/gssd.x
===================================================================
--- trunk/sys/kgssapi/gssd.x 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gssd.x 2018-05-26 21:57:38 UTC (rev 9988)
@@ -25,7 +25,8 @@
* SUCH DAMAGE.
*/
-/* $FreeBSD$ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/sys/kgssapi/gssd.x 184588 2008-11-03 10:38:00Z dfr $ */
#ifdef RPC_HDR
Property changes on: trunk/sys/kgssapi/gssd.x
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/kgssapi/gssd_prot.c
===================================================================
--- trunk/sys/kgssapi/gssd_prot.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gssd_prot.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gssd_prot.c 299617 2016-05-13 08:25:06Z ngie $");
#ifdef _KERNEL
#include <sys/malloc.h>
@@ -101,8 +102,10 @@
} else {
oid = mem_alloc(sizeof(gss_OID_desc));
memset(oid, 0, sizeof(*oid));
- if (!xdr_gss_OID_desc(xdrs, oid))
+ if (!xdr_gss_OID_desc(xdrs, oid)) {
+ mem_free(oid, sizeof(gss_OID_desc));
return (FALSE);
+ }
*oidp = oid;
}
break;
@@ -164,8 +167,10 @@
} else {
set = mem_alloc(sizeof(gss_OID_set_desc));
memset(set, 0, sizeof(*set));
- if (!xdr_gss_OID_set_desc(xdrs, set))
+ if (!xdr_gss_OID_set_desc(xdrs, set)) {
+ mem_free(set, sizeof(gss_OID_set_desc));
return (FALSE);
+ }
*setp = set;
}
break;
@@ -224,8 +229,10 @@
|| !xdr_gss_buffer_desc(xdrs,
&ch->acceptor_address)
|| !xdr_gss_buffer_desc(xdrs,
- &ch->application_data))
+ &ch->application_data)) {
+ mem_free(ch, sizeof(*ch));
return (FALSE);
+ }
*chp = ch;
}
break;
Modified: trunk/sys/kgssapi/gsstest.c
===================================================================
--- trunk/sys/kgssapi/gsstest.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/gsstest.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/gsstest.c 193066 2009-05-29 21:27:12Z jamie $");
#include <sys/ctype.h>
#include <sys/param.h>
Modified: trunk/sys/kgssapi/kgss_if.m
===================================================================
--- trunk/sys/kgssapi/kgss_if.m 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/kgss_if.m 2018-05-26 21:57:38 UTC (rev 9988)
@@ -24,7 +24,8 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD$
+# $FreeBSD: stable/10/sys/kgssapi/kgss_if.m 184588 2008-11-03 10:38:00Z dfr $
+# $MidnightBSD$
# Interface for the in-kernel part of a GSS-API mechanism
Property changes on: trunk/sys/kgssapi/kgss_if.m
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/kgssapi/krb5/kcrypto.c
===================================================================
--- trunk/sys/kgssapi/krb5/kcrypto.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/krb5/kcrypto.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/krb5/kcrypto.c 184588 2008-11-03 10:38:00Z dfr $");
#include <sys/param.h>
#include <sys/malloc.h>
Modified: trunk/sys/kgssapi/krb5/kcrypto.h
===================================================================
--- trunk/sys/kgssapi/krb5/kcrypto.h 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/krb5/kcrypto.h 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -24,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/kgssapi/krb5/kcrypto.h 184588 2008-11-03 10:38:00Z dfr $
*/
#include <sys/_iovec.h>
Modified: trunk/sys/kgssapi/krb5/kcrypto_aes.c
===================================================================
--- trunk/sys/kgssapi/krb5/kcrypto_aes.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/krb5/kcrypto_aes.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/sys/kgssapi/krb5/kcrypto_aes.c 299617 2016-05-13 08:25:06Z ngie $");
#include <sys/param.h>
#include <sys/lock.h>
@@ -43,7 +44,8 @@
struct aes_state {
struct mtx as_lock;
- uint64_t as_session;
+ uint64_t as_session_aes;
+ uint64_t as_session_sha1;
};
static void
@@ -61,8 +63,10 @@
{
struct aes_state *as = ks->ks_priv;
- if (as->as_session)
- crypto_freesession(as->as_session);
+ if (as->as_session_aes != 0)
+ crypto_freesession(as->as_session_aes);
+ if (as->as_session_sha1 != 0)
+ crypto_freesession(as->as_session_sha1);
mtx_destroy(&as->as_lock);
free(ks->ks_priv, M_GSSAPI);
}
@@ -72,32 +76,35 @@
{
void *kp = ks->ks_key;
struct aes_state *as = ks->ks_priv;
- struct cryptoini cri[2];
+ struct cryptoini cri;
if (kp != in)
bcopy(in, kp, ks->ks_class->ec_keylen);
- if (as->as_session)
- crypto_freesession(as->as_session);
+ if (as->as_session_aes != 0)
+ crypto_freesession(as->as_session_aes);
+ if (as->as_session_sha1 != 0)
+ crypto_freesession(as->as_session_sha1);
- bzero(cri, sizeof(cri));
-
/*
* We only want the first 96 bits of the HMAC.
*/
- cri[0].cri_alg = CRYPTO_SHA1_HMAC;
- cri[0].cri_klen = ks->ks_class->ec_keybits;
- cri[0].cri_mlen = 12;
- cri[0].cri_key = ks->ks_key;
- cri[0].cri_next = &cri[1];
+ bzero(&cri, sizeof(cri));
+ cri.cri_alg = CRYPTO_SHA1_HMAC;
+ cri.cri_klen = ks->ks_class->ec_keybits;
+ cri.cri_mlen = 12;
+ cri.cri_key = ks->ks_key;
+ cri.cri_next = NULL;
+ crypto_newsession(&as->as_session_sha1, &cri,
+ CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE);
- cri[1].cri_alg = CRYPTO_AES_CBC;
- cri[1].cri_klen = ks->ks_class->ec_keybits;
- cri[1].cri_mlen = 0;
- cri[1].cri_key = ks->ks_key;
- cri[1].cri_next = NULL;
-
- crypto_newsession(&as->as_session, cri,
+ bzero(&cri, sizeof(cri));
+ cri.cri_alg = CRYPTO_AES_CBC;
+ cri.cri_klen = ks->ks_class->ec_keybits;
+ cri.cri_mlen = 0;
+ cri.cri_key = ks->ks_key;
+ cri.cri_next = NULL;
+ crypto_newsession(&as->as_session_aes, &cri,
CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE);
}
@@ -114,7 +121,7 @@
int error;
struct aes_state *as = (struct aes_state *) crp->crp_opaque;
- if (CRYPTO_SESID2CAPS(as->as_session) & CRYPTOCAP_F_SYNC)
+ if (CRYPTO_SESID2CAPS(crp->crp_sid) & CRYPTOCAP_F_SYNC)
return (0);
error = crp->crp_etype;
@@ -151,7 +158,7 @@
crd->crd_next = NULL;
crd->crd_alg = CRYPTO_AES_CBC;
- crp->crp_sid = as->as_session;
+ crp->crp_sid = as->as_session_aes;
crp->crp_flags = buftype | CRYPTO_F_CBIFSYNC;
crp->crp_buf = buf;
crp->crp_opaque = (void *) as;
@@ -159,7 +166,7 @@
error = crypto_dispatch(crp);
- if ((CRYPTO_SESID2CAPS(as->as_session) & CRYPTOCAP_F_SYNC) == 0) {
+ if ((CRYPTO_SESID2CAPS(as->as_session_aes) & CRYPTOCAP_F_SYNC) == 0) {
mtx_lock(&as->as_lock);
if (!error && !(crp->crp_flags & CRYPTO_F_DONE))
error = msleep(crp, &as->as_lock, 0, "gssaes", 0);
@@ -326,7 +333,7 @@
crd->crd_next = NULL;
crd->crd_alg = CRYPTO_SHA1_HMAC;
- crp->crp_sid = as->as_session;
+ crp->crp_sid = as->as_session_sha1;
crp->crp_ilen = inlen;
crp->crp_olen = 12;
crp->crp_etype = 0;
@@ -337,7 +344,7 @@
error = crypto_dispatch(crp);
- if ((CRYPTO_SESID2CAPS(as->as_session) & CRYPTOCAP_F_SYNC) == 0) {
+ if ((CRYPTO_SESID2CAPS(as->as_session_sha1) & CRYPTOCAP_F_SYNC) == 0) {
mtx_lock(&as->as_lock);
if (!error && !(crp->crp_flags & CRYPTO_F_DONE))
error = msleep(crp, &as->as_lock, 0, "gssaes", 0);
Modified: trunk/sys/kgssapi/krb5/kcrypto_arcfour.c
===================================================================
--- trunk/sys/kgssapi/krb5/kcrypto_arcfour.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/krb5/kcrypto_arcfour.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
Modified: trunk/sys/kgssapi/krb5/kcrypto_des.c
===================================================================
--- trunk/sys/kgssapi/krb5/kcrypto_des.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/krb5/kcrypto_des.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
Modified: trunk/sys/kgssapi/krb5/kcrypto_des3.c
===================================================================
--- trunk/sys/kgssapi/krb5/kcrypto_des3.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/krb5/kcrypto_des3.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
Modified: trunk/sys/kgssapi/krb5/krb5_mech.c
===================================================================
--- trunk/sys/kgssapi/krb5/krb5_mech.c 2018-05-26 21:55:02 UTC (rev 9987)
+++ trunk/sys/kgssapi/krb5/krb5_mech.c 2018-05-26 21:57:38 UTC (rev 9988)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
* Authors: Doug Rabson <dfr at rabson.org>
More information about the Midnightbsd-cvs
mailing list