From 4bcab33bf9923ac339d55fb33c1251f376deb832 Mon Sep 17 00:00:00 2001 From: nectar Date: Tue, 28 Jan 2003 20:18:26 +0000 Subject: Make the Kerberos 4 bits build against OpenSSL 0.9.7. This required two basic changes (both of which should be no-ops until OpenSSL 0.9.7 is imported): = Define OPENSSL_DES_LIBDES_COMPATIBILITY wherever we include openssl/des.h. = Spell `struct des_ks_struct []' using the existing `des_key_schedule' typedef. When OpenSSL 0.9.7 is imported, `des_key_schedule' (among other things) will be a macro invocation instead of a typedef, and things should `just work'. Yes, this commit does take several files off the vendor branch. I do not expect there to be future imports of KTH Kerberos 4. --- crypto/kerberosIV/admin/adm_locl.h | 1 + crypto/kerberosIV/appl/afsutil/kstring2key.c | 1 + crypto/kerberosIV/appl/bsd/bsd_locl.h | 1 + crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h | 1 + crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c | 1 + crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c | 1 + crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c | 1 + crypto/kerberosIV/appl/telnet/telnetd/telnetd.h | 1 + crypto/kerberosIV/kadmin/kadm_locl.h | 1 + crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c | 2 +- crypto/kerberosIV/lib/kadm/kadm_locl.h | 1 + crypto/kerberosIV/lib/krb/krb-protos.h | 11 ++++++----- crypto/kerberosIV/lib/krb/krb.h | 1 + crypto/kerberosIV/lib/krb/krb_check_auth.c | 3 ++- crypto/kerberosIV/lib/krb/mk_priv.c | 3 ++- crypto/kerberosIV/lib/krb/rd_priv.c | 3 ++- crypto/kerberosIV/lib/krb/recvauth.c | 3 ++- crypto/kerberosIV/lib/krb/sendauth.c | 3 ++- crypto/kerberosIV/lib/krb/solaris_compat.c | 5 +++-- crypto/kerberosIV/server/kerberos.c | 1 + 20 files changed, 32 insertions(+), 13 deletions(-) diff --git a/crypto/kerberosIV/admin/adm_locl.h b/crypto/kerberosIV/admin/adm_locl.h index 8004d0a..b427a2d 100644 --- a/crypto/kerberosIV/admin/adm_locl.h +++ b/crypto/kerberosIV/admin/adm_locl.h @@ -78,6 +78,7 @@ #include +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include #include #include diff --git a/crypto/kerberosIV/appl/afsutil/kstring2key.c b/crypto/kerberosIV/appl/afsutil/kstring2key.c index 70246f9..bdcf67d 100644 --- a/crypto/kerberosIV/appl/afsutil/kstring2key.c +++ b/crypto/kerberosIV/appl/afsutil/kstring2key.c @@ -43,6 +43,7 @@ RCSID("$Id: kstring2key.c,v 1.16 1999/12/02 16:58:28 joda Exp $"); #include +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include #include diff --git a/crypto/kerberosIV/appl/bsd/bsd_locl.h b/crypto/kerberosIV/appl/bsd/bsd_locl.h index 565eb96..c5be006 100644 --- a/crypto/kerberosIV/appl/bsd/bsd_locl.h +++ b/crypto/kerberosIV/appl/bsd/bsd_locl.h @@ -270,6 +270,7 @@ struct tm *localtime(const time_t *); struct hostent *gethostbyname(const char *); #endif +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include #include #include diff --git a/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h b/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h index c0d6cae..9bafdf6 100644 --- a/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h +++ b/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h @@ -130,6 +130,7 @@ struct hostent *gethostbyname(const char *); #include "roken.h" #include "security.h" +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include /* for des_read_pw_string */ #if defined(__sun__) && !defined(__svr4) diff --git a/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c b/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c index ec13b3f..7bda5af 100644 --- a/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c +++ b/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c @@ -51,6 +51,7 @@ RCSID("$Id: enc_des.c,v 1.16 1998/07/09 23:16:23 assar Exp $"); #include "encrypt.h" #include "misc-proto.h" +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include extern int encrypt_debug_mode; diff --git a/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c b/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c index 9037ac6..45e7293 100644 --- a/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c +++ b/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c @@ -66,6 +66,7 @@ RCSID("$Id: kerberos.c,v 1.46 1999/09/16 20:41:33 assar Exp $"); #include #endif #include +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include /* BSD wont include this in krb.h, so we do it here */ #include #include diff --git a/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c b/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c index a4f8a2c..82f31e7 100644 --- a/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c +++ b/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c @@ -75,6 +75,7 @@ RCSID("$Id: krb4encpwd.c,v 1.18 1999/09/16 20:41:34 assar Exp $"); #include #include +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include #include #include diff --git a/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h b/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h index c89ce0e..955ca1a 100644 --- a/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h +++ b/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h @@ -167,6 +167,7 @@ struct hostent *gethostbyname(const char *); #endif #ifdef KRB4 +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include #include #endif diff --git a/crypto/kerberosIV/kadmin/kadm_locl.h b/crypto/kerberosIV/kadmin/kadm_locl.h index 98d07ae..9c0da54 100644 --- a/crypto/kerberosIV/kadmin/kadm_locl.h +++ b/crypto/kerberosIV/kadmin/kadm_locl.h @@ -112,6 +112,7 @@ struct hostent *gethostbyname(const char *); #include #include +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include #include #include diff --git a/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c b/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c index 2c7f006..7208487 100644 --- a/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c +++ b/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c @@ -139,7 +139,7 @@ kadm_cli_conn(void) /* takes in the sess_key and key_schedule and sets them appropriately */ static int kadm_cli_keyd(des_cblock (*s_k), /* session key */ - struct des_ks_struct *s_s) /* session key schedule */ + des_key_schedule s_s) /* session key schedule */ { CREDENTIALS cred; /* to get key data */ int stat; diff --git a/crypto/kerberosIV/lib/kadm/kadm_locl.h b/crypto/kerberosIV/lib/kadm/kadm_locl.h index 6740709..53f6d9a 100644 --- a/crypto/kerberosIV/lib/kadm/kadm_locl.h +++ b/crypto/kerberosIV/lib/kadm/kadm_locl.h @@ -70,6 +70,7 @@ struct hostent *gethostbyname(const char *); #include +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include #include #include diff --git a/crypto/kerberosIV/lib/krb/krb-protos.h b/crypto/kerberosIV/lib/krb/krb-protos.h index 0fbf46a..69bd1ca 100644 --- a/crypto/kerberosIV/lib/krb/krb-protos.h +++ b/crypto/kerberosIV/lib/krb/krb-protos.h @@ -32,6 +32,7 @@ */ /* $Id: krb-protos.h,v 1.24.2.1 2000/06/23 03:32:04 assar Exp $ */ +/* $FreeBSD$ */ #ifndef __krb_protos_h__ #define __krb_protos_h__ @@ -177,7 +178,7 @@ krb_check_auth __P(( u_int32_t checksum, MSG_DAT *msg_data, des_cblock *session, - struct des_ks_struct *schedule, + des_key_schedule schedule, struct sockaddr_in *laddr, struct sockaddr_in *faddr)); @@ -449,7 +450,7 @@ krb_mk_priv __P(( void *in, void *out, u_int32_t length, - struct des_ks_struct *schedule, + des_key_schedule schedule, des_cblock *key, struct sockaddr_in *sender, struct sockaddr_in *receiver)); @@ -526,7 +527,7 @@ int32_t KRB_LIB_FUNCTION krb_rd_priv __P(( void *in, u_int32_t in_length, - struct des_ks_struct *schedule, + des_key_schedule schedule, des_cblock *key, struct sockaddr_in *sender, struct sockaddr_in *receiver, @@ -569,7 +570,7 @@ krb_recvauth __P(( struct sockaddr_in *laddr, AUTH_DAT *kdata, char *filename, - struct des_ks_struct *schedule, + des_key_schedule schedule, char *version)); int KRB_LIB_FUNCTION @@ -583,7 +584,7 @@ krb_sendauth __P(( u_int32_t checksum, MSG_DAT *msg_data, CREDENTIALS *cred, - struct des_ks_struct *schedule, + des_key_schedule schedule, struct sockaddr_in *laddr, struct sockaddr_in *faddr, char *version)); diff --git a/crypto/kerberosIV/lib/krb/krb.h b/crypto/kerberosIV/lib/krb/krb.h index 6f7386f..1a850ca 100644 --- a/crypto/kerberosIV/lib/krb/krb.h +++ b/crypto/kerberosIV/lib/krb/krb.h @@ -48,6 +48,7 @@ __BEGIN_DECLS #if !defined(NOPROTO) && !defined(__STDC__) #define NOPROTO #endif +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include /* CNS compatibility ahead! */ diff --git a/crypto/kerberosIV/lib/krb/krb_check_auth.c b/crypto/kerberosIV/lib/krb/krb_check_auth.c index f20b5c2..00e68ca 100644 --- a/crypto/kerberosIV/lib/krb/krb_check_auth.c +++ b/crypto/kerberosIV/lib/krb/krb_check_auth.c @@ -30,6 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* $FreeBSD$ */ #include "krb_locl.h" @@ -50,7 +51,7 @@ krb_check_auth(KTEXT packet, u_int32_t checksum, MSG_DAT *msg_data, des_cblock *session, - struct des_ks_struct *schedule, + des_key_schedule schedule, struct sockaddr_in *laddr, struct sockaddr_in *faddr) { diff --git a/crypto/kerberosIV/lib/krb/mk_priv.c b/crypto/kerberosIV/lib/krb/mk_priv.c index a72b732..97a91c5 100644 --- a/crypto/kerberosIV/lib/krb/mk_priv.c +++ b/crypto/kerberosIV/lib/krb/mk_priv.c @@ -30,6 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* $FreeBSD$ */ #include "krb_locl.h" @@ -78,7 +79,7 @@ RCSID("$Id: mk_priv.c,v 1.22 1999/12/02 16:58:43 joda Exp $"); int32_t krb_mk_priv(void *in, void *out, u_int32_t length, - struct des_ks_struct *schedule, des_cblock *key, + des_key_schedule schedule, des_cblock *key, struct sockaddr_in *sender, struct sockaddr_in *receiver) { unsigned char *p = (unsigned char*)out; diff --git a/crypto/kerberosIV/lib/krb/rd_priv.c b/crypto/kerberosIV/lib/krb/rd_priv.c index 0bb0a40..5ae161a 100644 --- a/crypto/kerberosIV/lib/krb/rd_priv.c +++ b/crypto/kerberosIV/lib/krb/rd_priv.c @@ -30,6 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* $FreeBSD$ */ #include "krb_locl.h" @@ -57,7 +58,7 @@ RCSID("$Id: rd_priv.c,v 1.27 1999/12/02 16:58:43 joda Exp $"); int32_t krb_rd_priv(void *in, u_int32_t in_length, - struct des_ks_struct *schedule, des_cblock *key, + des_key_schedule schedule, des_cblock *key, struct sockaddr_in *sender, struct sockaddr_in *receiver, MSG_DAT *m_data) { diff --git a/crypto/kerberosIV/lib/krb/recvauth.c b/crypto/kerberosIV/lib/krb/recvauth.c index f164b2b..1bd805d 100644 --- a/crypto/kerberosIV/lib/krb/recvauth.c +++ b/crypto/kerberosIV/lib/krb/recvauth.c @@ -18,6 +18,7 @@ this software for any purpose. It is provided "as is" without express or implied warranty. */ +/* $FreeBSD$ */ #include "krb_locl.h" @@ -108,7 +109,7 @@ krb_recvauth(int32_t options, /* bit-pattern of options */ struct sockaddr_in *laddr, /* local address */ AUTH_DAT *kdata, /* kerberos data (returned) */ char *filename, /* name of file with service keys */ - struct des_ks_struct *schedule, /* key schedule (return) */ + des_key_schedule schedule, /* key schedule (return) */ char *version) /* version string (filled in) */ { int cc; diff --git a/crypto/kerberosIV/lib/krb/sendauth.c b/crypto/kerberosIV/lib/krb/sendauth.c index 201b388..df73e46 100644 --- a/crypto/kerberosIV/lib/krb/sendauth.c +++ b/crypto/kerberosIV/lib/krb/sendauth.c @@ -18,6 +18,7 @@ this software for any purpose. It is provided "as is" without express or implied warranty. */ +/* $FreeBSD$ */ #include "krb_locl.h" @@ -103,7 +104,7 @@ krb_sendauth(int32_t options, /* bit-pattern of options */ u_int32_t checksum, /* checksum to include in request */ MSG_DAT *msg_data, /* mutual auth MSG_DAT (return) */ CREDENTIALS *cred, /* credentials (return) */ - struct des_ks_struct *schedule, /* key schedule (return) */ + des_key_schedule schedule, /* key schedule (return) */ struct sockaddr_in *laddr, /* local address */ struct sockaddr_in *faddr, /* address of foreign host on fd */ char *version) /* version string */ diff --git a/crypto/kerberosIV/lib/krb/solaris_compat.c b/crypto/kerberosIV/lib/krb/solaris_compat.c index ff31e4b..b844313 100644 --- a/crypto/kerberosIV/lib/krb/solaris_compat.c +++ b/crypto/kerberosIV/lib/krb/solaris_compat.c @@ -30,6 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +/* $FreeBSD$ */ #include "krb_locl.h" @@ -42,7 +43,7 @@ RCSID("$Id: solaris_compat.c,v 1.4 1999/12/02 16:58:44 joda Exp $"); int32_t _C0095C2A(void *in, void *out, u_int32_t length, - struct des_ks_struct *schedule, des_cblock *key, + des_key_schedule schedule, des_cblock *key, struct sockaddr_in *sender, struct sockaddr_in *receiver) { return krb_mk_priv (in, out, length, schedule, key, sender, receiver); @@ -50,7 +51,7 @@ _C0095C2A(void *in, void *out, u_int32_t length, int32_t _C0095C2B(void *in, u_int32_t in_length, - struct des_ks_struct *schedule, des_cblock *key, + des_key_schedule schedule, des_cblock *key, struct sockaddr_in *sender, struct sockaddr_in *receiver, MSG_DAT *m_data) { diff --git a/crypto/kerberosIV/server/kerberos.c b/crypto/kerberosIV/server/kerberos.c index 09a65df..9e0d9b3 100644 --- a/crypto/kerberosIV/server/kerberos.c +++ b/crypto/kerberosIV/server/kerberos.c @@ -80,6 +80,7 @@ RCSID("$Id: kerberos.c,v 1.87.2.3 2000/10/18 20:24:13 assar Exp $"); #include #include +#define OPENSSL_DES_LIBDES_COMPATIBILITY #include #include #include -- cgit v1.1