From owner-cvs-all Tue Jan 28 12:18:29 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ECA1237B401; Tue, 28 Jan 2003 12:18:27 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4BD6243F43; Tue, 28 Jan 2003 12:18:27 -0800 (PST) (envelope-from nectar@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0SKIRbv020627; Tue, 28 Jan 2003 12:18:27 -0800 (PST) (envelope-from nectar@repoman.freebsd.org) Received: (from nectar@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0SKIRaw020626; Tue, 28 Jan 2003 12:18:27 -0800 (PST) Message-Id: <200301282018.h0SKIRaw020626@repoman.freebsd.org> From: Jacques Vidrine Date: Tue, 28 Jan 2003 12:18:26 -0800 (PST) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/crypto/kerberosIV/admin adm_locl.h src/crypto/kerberosIV/appl/afsutil kstring2key.c src/crypto/kerberosIV/appl/bsd bsd_locl.h src/crypto/kerberosIV/appl/ftp/ftp ftp_locl.h src/crypto/kerberosIV/appl/telnet/libtelnet enc_des.c kerberos.c krb4encpwd.c ... X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG nectar 2003/01/28 12:18:26 PST Modified files: crypto/kerberosIV/admin adm_locl.h crypto/kerberosIV/appl/afsutil kstring2key.c crypto/kerberosIV/appl/bsd bsd_locl.h crypto/kerberosIV/appl/ftp/ftp ftp_locl.h crypto/kerberosIV/appl/telnet/libtelnet enc_des.c kerberos.c krb4encpwd.c crypto/kerberosIV/appl/telnet/telnetd telnetd.h crypto/kerberosIV/kadmin kadm_locl.h crypto/kerberosIV/lib/kadm kadm_cli_wrap.c kadm_locl.h crypto/kerberosIV/lib/krb krb-protos.h krb.h krb_check_auth.c mk_priv.c rd_priv.c recvauth.c sendauth.c solaris_compat.c crypto/kerberosIV/server kerberos.c Log: 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. Revision Changes Path 1.4 +2 -1 src/crypto/kerberosIV/admin/adm_locl.h 1.4 +2 -1 src/crypto/kerberosIV/appl/afsutil/kstring2key.c 1.7 +1 -0 src/crypto/kerberosIV/appl/bsd/bsd_locl.h 1.4 +2 -1 src/crypto/kerberosIV/appl/ftp/ftp/ftp_locl.h 1.4 +2 -1 src/crypto/kerberosIV/appl/telnet/libtelnet/enc_des.c 1.5 +1 -0 src/crypto/kerberosIV/appl/telnet/libtelnet/kerberos.c 1.5 +1 -0 src/crypto/kerberosIV/appl/telnet/libtelnet/krb4encpwd.c 1.5 +1 -0 src/crypto/kerberosIV/appl/telnet/telnetd/telnetd.h 1.4 +2 -1 src/crypto/kerberosIV/kadmin/kadm_locl.h 1.3 +1 -1 src/crypto/kerberosIV/lib/kadm/kadm_cli_wrap.c 1.4 +2 -1 src/crypto/kerberosIV/lib/kadm/kadm_locl.h 1.2 +33 -16 src/crypto/kerberosIV/lib/krb/krb-protos.h 1.8 +2 -1 src/crypto/kerberosIV/lib/krb/krb.h 1.2 +4 -8 src/crypto/kerberosIV/lib/krb/krb_check_auth.c 1.2 +13 -17 src/crypto/kerberosIV/lib/krb/mk_priv.c 1.2 +6 -10 src/crypto/kerberosIV/lib/krb/rd_priv.c 1.2 +11 -8 src/crypto/kerberosIV/lib/krb/recvauth.c 1.2 +7 -4 src/crypto/kerberosIV/lib/krb/sendauth.c 1.2 +5 -9 src/crypto/kerberosIV/lib/krb/solaris_compat.c 1.5 +1 -0 src/crypto/kerberosIV/server/kerberos.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message