Return-Path: owner-ssh@clinet.fi Message-ID: X-Mailer: XFMail 1.3 [p0] on Linux X-Priority: 3 (Normal) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="_=XFMail.1.3.p0.Linux:000620092605:5773=_" Date: Tue, 20 Jun 2000 09:26:05 -0400 (EDT) Organization: AppliedTheory Corp. From: "Carl J. Nobile" To: ssh@clinet.fi Subject: Patch for ssh-1.2.27 and krb5-1.1.1 Cc: Anne Carasik Sender: owner-ssh@clinet.fi Precedence: bulk This message is in MIME format --_=XFMail.1.3.p0.Linux:000620092605:5773=_ Content-Type: text/plain; charset=us-ascii Hi All, Well I didn't get a response to my post about SSH1 compatibility with the newer kerberos versions, so I thought I'd write a patch myself. I found an old patch for krb5-1.0.6, but it didn't patch correctly nor did it solve the lib problem. It seems that SSD1 uses a macro krb5_xfree() that was suppose to be internal to kerberos. As of version krb5-1.0.6 it was moved from the public header krb5.h to the private header k5-int.h. This caused problems with compiling SSH1. At some point after krb5-1.0.6 the library libcrypto.so was renamed to libk5crypto.so causing even more problems with compiling SSH1. The files affected in my patch are: auth-kerberos.c Expanded macro to free((char FAR *) (val)); configure Changed the reference to the correct lib. configure.in Changed the reference to the correct lib. WARNING: This will make your ssh source able to compile ONLY with the newer kerberos versions. I didn't put conditional checks in configure.in which probably should be done. Contact me if you have any problems. Thanks, Carl P.S. Anne, maybe something should be put into the FAQ about this compatibility issue. ------------------------------------------------------------------------ E-Mail: Carl J. Nobile Date: 20-Jun-00 Phone: 315-453-2912 Ex. 5336 Time: 08:46:43 Fax: 315-479-0859 Software Engineering Group -- AppliedTheory Corp. 224 Harrison Street, 6th Floor, Syracuse, NY 13202 ------------------------------------------------------------------------ --_=XFMail.1.3.p0.Linux:000620092605:5773=_ Content-Disposition: attachment; filename="krb5-1.1.1_ssh-1.2.27.patch" Content-Transfer-Encoding: base64 Content-Description: krb5-1.1.1_ssh-1.2.27.patch Content-Type: application/octet-stream; name=krb5-1.1.1_ssh-1.2.27.patch; SizeOnDisk=2890 KioqIGF1dGgta2VyYmVyb3MuYy5vcmlnCU1vbiBKdW4gMTkgMTg6MjA6MTIgMjAwMAotLS0gYXV0 aC1rZXJiZXJvcy5jCU1vbiBKdW4gMTkgMTg6MjI6NDkgMjAwMAoqKioqKioqKioqKioqKioKKioq IDEyMCwxMjkgKioqKgogICAgICAgIAogICAgICAgIGRlYnVnKCJLZXJiZXJvcyBpbnZhbGlkIHNl cnZpY2UgbmFtZSAoJS4xMDBzKS4iLCBzZXJ2ZXIpOwogICAgICAgIHBhY2tldF9zZW5kX2RlYnVn KCJLZXJiZXJvcyBpbnZhbGlkIHNlcnZpY2UgbmFtZSAoJS4xMDBzKS4iLCBzZXJ2ZXIpOwohICAg ICAgIGtyYjVfeGZyZWUoc2VydmVyKTsKICAgICAgICByZXR1cm4gMDsKICAgICAgfQohICAga3Ji NV94ZnJlZShzZXJ2ZXIpOwogICAgCiAgICAvKiBFeHRyYWN0IHRoZSB1c2VycyBuYW1lIGZyb20g dGhlIHRpY2tldCBjbGllbnQgcHJpbmNpcGFsICovCiAgICBwcm9ibGVtID0ga3JiNV9jb3B5X3By aW5jaXBhbChzc2hfY29udGV4dCwgdGlja2V0LT5lbmNfcGFydDItPmNsaWVudCwKLS0tIDEyMCwx MjkgLS0tLQogICAgICAgIAogICAgICAgIGRlYnVnKCJLZXJiZXJvcyBpbnZhbGlkIHNlcnZpY2Ug bmFtZSAoJS4xMDBzKS4iLCBzZXJ2ZXIpOwogICAgICAgIHBhY2tldF9zZW5kX2RlYnVnKCJLZXJi ZXJvcyBpbnZhbGlkIHNlcnZpY2UgbmFtZSAoJS4xMDBzKS4iLCBzZXJ2ZXIpOwohICAgICAgIGZy ZWUoKGNoYXIgRkFSICopIHNlcnZlcik7CiAgICAgICAgcmV0dXJuIDA7CiAgICAgIH0KISAgIGZy ZWUoKGNoYXIgRkFSICopIHNlcnZlcik7CiAgICAKICAgIC8qIEV4dHJhY3QgdGhlIHVzZXJzIG5h bWUgZnJvbSB0aGUgdGlja2V0IGNsaWVudCBwcmluY2lwYWwgKi8KICAgIHByb2JsZW0gPSBrcmI1 X2NvcHlfcHJpbmNpcGFsKHNzaF9jb250ZXh0LCB0aWNrZXQtPmVuY19wYXJ0Mi0+Y2xpZW50LAoq KioqKioqKioqKioqKioKKioqIDE1OSwxNjUgKioqKgogICAgcGFja2V0X3B1dF9zdHJpbmcoKGNo YXIgKikgcmVwbHkuZGF0YSwgcmVwbHkubGVuZ3RoKTsKICAgIHBhY2tldF9zZW5kKCk7CiAgICBw YWNrZXRfd3JpdGVfd2FpdCgpOwohICAga3JiNV94ZnJlZShyZXBseS5kYXRhKTsKICAgIHJldHVy biAxOwogIH0KICAjZW5kaWYgLyogS1JCNSAqLwotLS0gMTU5LDE2NSAtLS0tCiAgICBwYWNrZXRf cHV0X3N0cmluZygoY2hhciAqKSByZXBseS5kYXRhLCByZXBseS5sZW5ndGgpOwogICAgcGFja2V0 X3NlbmQoKTsKICAgIHBhY2tldF93cml0ZV93YWl0KCk7CiEgICBmcmVlKChjaGFyIEZBUiAqKSBy ZXBseS5kYXRhKTsKICAgIHJldHVybiAxOwogIH0KICAjZW5kaWYgLyogS1JCNSAqLwoqKiogY29u ZmlndXJlLm9yaWcJTW9uIEp1biAxOSAxODoyNToyNyAyMDAwCi0tLSBjb25maWd1cmUJTW9uIEp1 biAxOSAxODoyNTozNyAyMDAwCioqKioqKioqKioqKioqKgoqKiogNjY0Nyw2NjUzICoqKioKICAK ICAgIEtFUkJFUk9TX1JPT1Q9IiR3aXRoX2tlcmJlcm9zNSIKICAgIEtFUkJFUk9TX0lOQ1M9Ii1J JHtLRVJCRVJPU19ST09UfS9pbmNsdWRlIgohICAgS0VSQkVST1NfTElCUz0iLUwke0tFUkJFUk9T X1JPT1R9L2xpYiAtbGdzc2FwaV9rcmI1IC1sa3JiNSAtbGNyeXB0byAtbGNvbV9lcnIiCiAgICBl Y2hvICRhY19uICJjaGVja2luZyBmb3IgZGJtX29wZW4gaW4gLWxuZGJtIiIuLi4gJGFjX2MiIDE+ JjYKICBlY2hvICJjb25maWd1cmU6NjY1MzogY2hlY2tpbmcgZm9yIGRibV9vcGVuIGluIC1sbmRi bSIgPiY1CiAgYWNfbGliX3Zhcj1gZWNobyBuZGJtJ18nZGJtX29wZW4gfCBzZWQgJ3klLi8rLSVf X3BfJSdgCi0tLSA2NjQ3LDY2NTMgLS0tLQogIAogICAgS0VSQkVST1NfUk9PVD0iJHdpdGhfa2Vy YmVyb3M1IgogICAgS0VSQkVST1NfSU5DUz0iLUkke0tFUkJFUk9TX1JPT1R9L2luY2x1ZGUiCiEg ICBLRVJCRVJPU19MSUJTPSItTCR7S0VSQkVST1NfUk9PVH0vbGliIC1sZ3NzYXBpX2tyYjUgLWxr cmI1IC1sazVjcnlwdG8gLWxjb21fZXJyIgogICAgZWNobyAkYWNfbiAiY2hlY2tpbmcgZm9yIGRi bV9vcGVuIGluIC1sbmRibSIiLi4uICRhY19jIiAxPiY2CiAgZWNobyAiY29uZmlndXJlOjY2NTM6 IGNoZWNraW5nIGZvciBkYm1fb3BlbiBpbiAtbG5kYm0iID4mNQogIGFjX2xpYl92YXI9YGVjaG8g bmRibSdfJ2RibV9vcGVuIHwgc2VkICd5JS4vKy0lX19wXyUnYAoqKiogY29uZmlndXJlLmluLm9y aWcJTW9uIEp1biAxOSAxODoyNjo1OCAyMDAwCi0tLSBjb25maWd1cmUuaW4JTW9uIEp1biAxOSAx ODoyNzoxMyAyMDAwCioqKioqKioqKioqKioqKgoqKiogOTMyLDkzOCAqKioqCiAgICBBQ19ERUZJ TkUoS1JCNSkKICAgIEtFUkJFUk9TX1JPT1Q9IiR3aXRoX2tlcmJlcm9zNSIKICAgIEtFUkJFUk9T X0lOQ1M9Ii1JJHtLRVJCRVJPU19ST09UfS9pbmNsdWRlIgohICAgS0VSQkVST1NfTElCUz0iLUwk e0tFUkJFUk9TX1JPT1R9L2xpYiAtbGdzc2FwaV9rcmI1IC1sa3JiNSAtbGNyeXB0byAtbGNvbV9l cnIiCiAgICBBQ19DSEVDS19MSUIobmRibSwgZGJtX29wZW4sIEtFUkJFUk9TX0xJQlM9IiRLRVJC RVJPU19MSUJTIC1sbmRibSIpCiAgICBLRVJCRVJPU19PQkpTPSJhdXRoLWtlcmJlcm9zLm8iCiAg ICA7OwotLS0gOTMyLDkzOCAtLS0tCiAgICBBQ19ERUZJTkUoS1JCNSkKICAgIEtFUkJFUk9TX1JP T1Q9IiR3aXRoX2tlcmJlcm9zNSIKICAgIEtFUkJFUk9TX0lOQ1M9Ii1JJHtLRVJCRVJPU19ST09U fS9pbmNsdWRlIgohICAgS0VSQkVST1NfTElCUz0iLUwke0tFUkJFUk9TX1JPT1R9L2xpYiAtbGdz c2FwaV9rcmI1IC1sa3JiNSAtbGs1Y3J5cHRvIC1sY29tX2VyciIKICAgIEFDX0NIRUNLX0xJQihu ZGJtLCBkYm1fb3BlbiwgS0VSQkVST1NfTElCUz0iJEtFUkJFUk9TX0xJQlMgLWxuZGJtIikKICAg IEtFUkJFUk9TX09CSlM9ImF1dGgta2VyYmVyb3MubyIKICAgIDs7Cg== --_=XFMail.1.3.p0.Linux:000620092605:5773=_-- End of MIME message