Re: OpenSSL patch for Heimdal 0.3d

[Brian May <bam@snoopy.apana.org.au>]

>>>>> "GOMBAS" == GOMBAS Gabor <gombasg@inf.elte.hu> writes:

    GOMBAS> The patch should support OpenSSL-0.9.6; it was tested on
    GOMBAS> AIX 4.3.3.0, Solaris 7 and Debian Linux 2.2 (well, the
    GOMBAS> actually tested version contains more local changes, but
    GOMBAS> they are orthogonal to the changes in the published
    GOMBAS> patch).

As far as I can tell, the patch has broken crypto.c:

gcc -DHAVE_CONFIG_H -I. -I. -I../../include -I../../include -I../../lib/roken -I../../lib/roken -Wall -Wmissing-prototypes -Wpointer-arith -Wbad-function-cast -Wmissing-declarations -Wnested-externs -g -O2 -c crypto.c  -fPIC -DPIC -o .libs/crypto.lo
crypto.c:2532: unterminated `#else' conditional
make[3]: *** [crypto.lo] Error 1
make[3]: Leaving directory `/home/bam/source/notmine/heimdal-0.3d/build-tree/heimdal-0.3d/lib/krb5'

I looked through the diff, and seemed to confirm this:

diff -u -N -r heimdal-0.3d.orig/lib/krb5/crypto.c heimdal/lib/krb5/crypto.c
--- heimdal-0.3d.orig/lib/krb5/crypto.c Thu Dec 21 23:58:11 2000
+++ heimdal/lib/krb5/crypto.c   Wed Jan  3 18:34:43 2001
@@ -2529,6 +2529,70 @@
  *                                                          *
  ************************************************************/
 
+#ifdef HAVE_OPENSSL_CRYPTO_H
[...]
+#else
 void
 krb5_generate_random_block(void *buf, size_t len)
 {

but no #endif

(probably should go after the krb5_generate_random_number function?)
-- 
Brian May <bam@snoopy.apana.org.au>