Conflicting functions in mod_ssl and OpenSSL snapshot

[Svenning Sørensen]

Hello all.

There seems to be a conflict between mod_ssl and the OpenSSL snapshot.

Both define a function, d2i_PrivateKey_bio(), but with conflicting parameter
lists.
Essentially they seem to do pretty much the same thing, but mod_ssl will not
compile
because of the conflict (OpenSSL defines the function in x509.h).

In x_all.c from openssl-SNAP-20000203:

EVP_PKEY *d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a)
        {
        return((EVP_PKEY *)ASN1_d2i_bio((char *(*)())EVP_PKEY_new,
                (char *(*)())d2i_AutoPrivateKey, (bp),(unsigned char **)(a)));
        }

In ssl_util_ssl.c from mod_ssl-2.5.0-1.3.11:

static EVP_PKEY *d2i_PrivateKey_bio(BIO *bio, EVP_PKEY *key)
{
     return ((EVP_PKEY *)ASN1_d2i_bio(
             (char *(*)())EVP_PKEY_new,
             (char *(*)())d2i_PrivateKey,
             (bio), (unsigned char **)(key)));
}

I haven't digged too deep into the sources, so I don't know which function
is "most correct".

For now, I've avoided the problem by using the official OpenSSL 0.9.4
release,
but thought I'd just point the problem out.

Regards, Svenning Sørensen

______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
User Support Mailing List                    [EMAIL PROTECTED]
Automated List Manager                           [EMAIL PROTECTED]