Patch to avoid conflicts with OpenSSL headers

Adam Langley alangley at gmail.com
Fri Jan 29 15:16:10 EST 2016


I'm not sure of your preferred process for submitting patches, so
please advise if this isn't it.

The attached git patch renames the MD5_CTX structure to avoid
conflicts with OpenSSL:

    Rename MD5_CTX to SASL_MD5_CTX.

    Both this code and OpenSSL picked up the same MD5 naming from
    twenty-five years ago. Since C doesn't have namespaces, this causes
    conflicts when headers from cyrus-sasl and OpenSSL are included in the
    same file. This is fairly common and, indeed, occurs within several
    plugins included in cyrus-sasl.

    This change renames the MD5_CTX structure in cyrus-sasl to SASL_MD5_CTX
    to avoid this conflict. It also removes the workarounds that several
    plugins needed in order to use OpenSSL.


Cheers

AGL

-- 
Adam Langley agl at imperialviolet.org http://www.imperialviolet.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Rename-MD5_CTX-to-SASL_MD5_CTX.patch
Type: text/x-patch
Size: 26191 bytes
Desc: not available
URL: <http://lists.andrew.cmu.edu/pipermail/cyrus-sasl/attachments/20160129/77c2f28f/attachment-0001.bin>


More information about the Cyrus-sasl mailing list