From 8b0c7ec09a167e37fb6f7626cf0a633174e30184 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Thu, 22 Sep 2022 20:54:34 -0400 Subject: [PATCH] krb5: remove krb5-v4compat.h Kerberos v4 compatibility definitions are no longer required in the source tree. --- lib/kafs/kafs_locl.h | 1 - lib/krb5/Makefile.am | 1 - lib/krb5/NTMakefile | 12 ++- lib/krb5/convert_creds.c | 3 - lib/krb5/krb5-v4compat.h | 139 -------------------------------- packages/windows/sdk/NTMakefile | 2 - 6 files changed, 5 insertions(+), 153 deletions(-) delete mode 100644 lib/krb5/krb5-v4compat.h diff --git a/lib/kafs/kafs_locl.h b/lib/kafs/kafs_locl.h index 6f34ca631..f4e2f64b4 100644 --- a/lib/kafs/kafs_locl.h +++ b/lib/kafs/kafs_locl.h @@ -96,7 +96,6 @@ #endif #ifdef KRB5 #include "crypto-headers.h" -#include typedef struct credentials CREDENTIALS; #endif /* KRB5 */ #ifndef NO_AFS diff --git a/lib/krb5/Makefile.am b/lib/krb5/Makefile.am index c1345c28a..ecce461dd 100644 --- a/lib/krb5/Makefile.am +++ b/lib/krb5/Makefile.am @@ -193,7 +193,6 @@ dist_libkrb5_la_SOURCES = \ keytab_keyfile.c \ keytab_memory.c \ krb5_locl.h \ - krb5-v4compat.h \ krcache.c \ krbhst.c \ kuserok.c \ diff --git a/lib/krb5/NTMakefile b/lib/krb5/NTMakefile index 40ca0fb0b..993e76fcc 100644 --- a/lib/krb5/NTMakefile +++ b/lib/krb5/NTMakefile @@ -2,19 +2,19 @@ # # Copyright (c) 2009 - 2017, Secure Endpoints Inc. # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # - Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. -# +# # - Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in # the documentation and/or other materials provided with the # distribution. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS @@ -27,7 +27,7 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -# +# RELDIR=lib\krb5 @@ -184,7 +184,6 @@ INCFILES= \ $(INCDIR)\krb5_locl.h \ $(INCDIR)\krb5-protos.h \ $(INCDIR)\krb5-private.h \ - $(INCDIR)\krb5-v4compat.h \ $(INCDIR)\crypto.h \ $(INCDIR)\an2ln_plugin.h \ $(INCDIR)\ccache_plugin.h \ @@ -267,7 +266,6 @@ dist_libkrb5_la_SOURCES = \ keytab_keyfile.c \ keytab_memory.c \ krb5_locl.h \ - krb5-v4compat.h \ krbhst.c \ kuserok.c \ kx509.c \ diff --git a/lib/krb5/convert_creds.c b/lib/krb5/convert_creds.c index fc371c637..56261b29f 100644 --- a/lib/krb5/convert_creds.c +++ b/lib/krb5/convert_creds.c @@ -32,7 +32,6 @@ */ #include "krb5_locl.h" -#include "krb5-v4compat.h" #ifndef HEIMDAL_SMALLER @@ -58,7 +57,6 @@ krb524_convert_creds_kdc(krb5_context context, struct credentials *v4creds) KRB5_DEPRECATED_FUNCTION("Use X instead") { - memset(v4creds, 0, sizeof(*v4creds)); krb5_set_error_message(context, EINVAL, N_("krb524_convert_creds_kdc not supported", "")); return EINVAL; @@ -86,7 +84,6 @@ krb524_convert_creds_kdc_ccache(krb5_context context, struct credentials *v4creds) KRB5_DEPRECATED_FUNCTION("Use X instead") { - memset(v4creds, 0, sizeof(*v4creds)); krb5_set_error_message(context, EINVAL, N_("krb524_convert_creds_kdc_ccache not supported", "")); return EINVAL; diff --git a/lib/krb5/krb5-v4compat.h b/lib/krb5/krb5-v4compat.h deleted file mode 100644 index 2992976e6..000000000 --- a/lib/krb5/krb5-v4compat.h +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan - * (Royal Institute of Technology, Stockholm, Sweden). - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * 3. Neither the name of the Institute nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* $Id$ */ - -#ifndef __KRB5_V4COMPAT_H__ -#define __KRB5_V4COMPAT_H__ - -#include "krb_err.h" - -/* - * This file must only be included with v4 compat glue stuff in - * heimdal sources. - * - * It MUST NOT be installed. - */ - -#define KRB_PROT_VERSION 4 - -#define AUTH_MSG_KDC_REQUEST (1<<1) -#define AUTH_MSG_KDC_REPLY (2<<1) -#define AUTH_MSG_APPL_REQUEST (3<<1) -#define AUTH_MSG_APPL_REQUEST_MUTUAL (4<<1) -#define AUTH_MSG_ERR_REPLY (5<<1) -#define AUTH_MSG_PRIVATE (6<<1) -#define AUTH_MSG_SAFE (7<<1) -#define AUTH_MSG_APPL_ERR (8<<1) -#define AUTH_MSG_KDC_FORWARD (9<<1) -#define AUTH_MSG_KDC_RENEW (10<<1) -#define AUTH_MSG_DIE (63<<1) - -/* General definitions */ -#define KSUCCESS 0 -#define KFAILURE 255 - -/* */ - -#define MAX_KTXT_LEN 1250 - -#define ANAME_SZ 40 -#define REALM_SZ 40 -#define SNAME_SZ 40 -#define INST_SZ 40 - -struct ktext { - unsigned int length; /* Length of the text */ - unsigned char dat[MAX_KTXT_LEN]; /* The data itself */ - uint32_t mbz; /* zero to catch runaway strings */ -}; - -struct credentials { - char service[ANAME_SZ]; /* Service name */ - char instance[INST_SZ]; /* Instance */ - char realm[REALM_SZ]; /* Auth domain */ - char session[8]; /* Session key */ - int lifetime; /* Lifetime */ - int kvno; /* Key version number */ - struct ktext ticket_st; /* The ticket itself */ - int32_t issue_date; /* The issue time */ - char pname[ANAME_SZ]; /* Principal's name */ - char pinst[INST_SZ]; /* Principal's instance */ -}; - -#define TKTLIFENUMFIXED 64 -#define TKTLIFEMINFIXED 0x80 -#define TKTLIFEMAXFIXED 0xBF -#define TKTLIFENOEXPIRE 0xFF -#define MAXTKTLIFETIME (30*24*3600) /* 30 days */ -#ifndef NEVERDATE -#define NEVERDATE ((time_t)0x7fffffffL) -#endif - -#define KERB_ERR_NULL_KEY 10 - -#define CLOCK_SKEW 5*60 - -#ifndef TKT_ROOT -#define TKT_ROOT "%{TEMP}/tkt" -#endif - -struct _krb5_krb_auth_data { - int8_t k_flags; /* Flags from ticket */ - char *pname; /* Principal's name */ - char *pinst; /* His Instance */ - char *prealm; /* His Realm */ - uint32_t checksum; /* Data checksum (opt) */ - krb5_keyblock session; /* Session Key */ - unsigned char life; /* Life of ticket */ - uint32_t time_sec; /* Time ticket issued */ - uint32_t address; /* Address in ticket */ -}; - -KRB5_LIB_FUNCTION time_t KRB5_LIB_CALL -_krb5_krb_life_to_time (int, int); - -KRB5_LIB_FUNCTION int KRB5_LIB_CALL -_krb5_krb_time_to_life (time_t, time_t); - -KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL -_krb5_krb_tf_setup (krb5_context, struct credentials *, - const char *, int); - -KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL -_krb5_krb_dest_tkt(krb5_context, const char *); - -#define krb_time_to_life _krb5_krb_time_to_life -#define krb_life_to_time _krb5_krb_life_to_time - -#endif /* __KRB5_V4COMPAT_H__ */ diff --git a/packages/windows/sdk/NTMakefile b/packages/windows/sdk/NTMakefile index 934b0c17c..4f2d355bf 100644 --- a/packages/windows/sdk/NTMakefile +++ b/packages/windows/sdk/NTMakefile @@ -76,7 +76,6 @@ INCFILES=\ $(SDKINCDIR)\krb5\k5e1_err.h \ $(SDKINCDIR)\krb5\krb5-protos.h \ $(SDKINCDIR)\krb5\krb5-types.h \ - $(SDKINCDIR)\krb5\krb5-v4compat.h \ $(SDKINCDIR)\krb5\krb5.h \ $(SDKINCDIR)\krb5\krb5_asn1.h \ $(SDKINCDIR)\krb5\krb5_ccapi.h \ @@ -110,7 +109,6 @@ INCFILES=\ $(SDKINCDIR)\heimdal\k5e1_err.h \ $(SDKINCDIR)\heimdal\krb5-protos.h \ $(SDKINCDIR)\heimdal\krb5-types.h \ - $(SDKINCDIR)\heimdal\krb5-v4compat.h \ $(SDKINCDIR)\heimdal\krb5.h \ $(SDKINCDIR)\heimdal\krb5_asn1.h \ $(SDKINCDIR)\heimdal\krb5_ccapi.h \