From 51ff876d52dc4a3fbd8e213bc8e89f0ed58c90c9 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Aug 24 2009 15:51:36 +0000
Subject: - work around a compile problem with new openssl


---

diff --git a/krb5-1.7-openssl-1.0.patch b/krb5-1.7-openssl-1.0.patch
new file mode 100644
index 0000000..19aa774
--- /dev/null
+++ b/krb5-1.7-openssl-1.0.patch
@@ -0,0 +1,17 @@
+This isn't a proper fix (it doesn't actually switch to using the new API),
+but it'll do for now.
+diff -up src/plugins/preauth/pkinit/pkinit_crypto_openssl.c src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
+--- src/plugins/preauth/pkinit/pkinit_crypto_openssl.c.openssl-1.0	2009-01-23 01:51:03.000000000 -0500
++++ src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2009-08-24 11:19:35.000000000 -0400
+@@ -3652,7 +3652,11 @@ decode_data(unsigned char **out_data, un
+     if (buf == NULL)
+ 	goto cleanup;
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10000000L
+     retval = EVP_PKEY_decrypt(buf, data, (int)data_len, pkey);
++#else
++    retval = EVP_PKEY_decrypt_old(buf, data, (int)data_len, pkey);
++#endif
+     if (retval <= 0) {
+ 	pkiDebug("unable to decrypt received data (len=%d)\n", data_len);
+ 	goto cleanup;
diff --git a/krb5.spec b/krb5.spec
index 4440cfe..a9b24f2 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -10,7 +10,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.7/krb5-1.7-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -78,6 +78,7 @@ Patch86: krb5-1.7-time_t_size.patch
 Patch87: krb5-1.7-errs.patch
 Patch88: krb5-1.7-sizeof.patch
 Patch89: krb5-1.7-largefile.patch
+Patch90: krb5-1.7-openssl-1.0.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -207,12 +208,18 @@ to obtain initial credentials from a KDC using a private key and a
 certificate.
 
 %changelog
+* Mon Aug 24 2009 Nalin Dahyabhai <nalin@redhat.com> - 1.7-7
+- work around a compile problem with new openssl
+
 * Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 1.7-6
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
+* Tue Jul  7 2009 Nalin Dahyabhai <nalin@redhat.com> 1.7-5
+- rebuild to pick up the current forms of various patches
+
 * Mon Jul  6 2009 Nalin Dahyabhai <nalin@redhat.com>
 - simplify the man pages patch by only preprocessing the files we care about
   and moving shared configure.in logic into a shared function
@@ -1456,6 +1463,7 @@ popd
 %patch87 -p1 -b .errs
 %patch88 -p1 -b .sizeof
 %patch89 -p1 -b .largefile
+%patch90 -p0 -b .openssl-1.0
 gzip doc/*.ps
 
 sed -i -e '1s!\[twoside\]!!;s!%\(\\usepackage{hyperref}\)!\1!' doc/api/library.tex