mail/libdomainkeys: Correct OPENSSL_VERSION_NUMBER

For the sake posterity use OpenSSL 1.1.0-pre1's version which is
when EVP_MD_CTX was made opaque [1].  This should have no practical
impact on the build with any of the OpenSSL versions we support.

[1] https://github.com/openssl/openssl/commit/7638370ca6cb

Reported by:	danfe, jbeich

1 files changed, 14 insertions, 14 deletions

diff --git a/mail/libdomainkeys/files/patch-domainkeys.c b/mail/libdomainkeys/files/patch-domainkeys.c
index 185da4313dcc..eb2ba32a4d91 100644
--- a/mail/libdomainkeys/files/patch-domainkeys.c
+++ b/mail/libdomainkeys/files/patch-domainkeys.c
@@ -7,7 +7,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
  {
  /* STARTPRIV */
    int dkmarker;     /* in case somebody casts in */
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
    EVP_MD_CTX mdctx;   /* the hash */
 +#else
 +  EVP_MD_CTX *mdctx;  /* the hash */
@@ -20,7 +20,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
    }
    dk->canon = canon; /* TC13-simple, TC13-nofws */
 -  EVP_SignInit(&dk->mdctx, dklib->md);
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
 +  if (!EVP_SignInit(&dk->mdctx, dklib->md)) {
 +    if (statp)
 +    {
@@ -46,7 +46,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
      return NULL;
    }
 -  EVP_VerifyInit(&dk->mdctx, dklib->md);
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
 +  if (!EVP_VerifyInit(&dk->mdctx, dklib->md)) {
 +    if (statp)
 +    {
@@ -71,7 +71,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
      {
  
  #ifndef DK_HASH_BUFF
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
        EVP_DigestUpdate(&dk->mdctx, "\r\n", 2);
  #else
 +      EVP_DigestUpdate(dk->mdctx, "\r\n", 2);
@@ -82,7 +82,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
        dk->hash_buff[dk->hash_buff_len++] = '\n';
        if (dk->hash_buff_len >= (DK_BLOCK - 1))
        {
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
          EVP_DigestUpdate(&dk->mdctx, dk->hash_buff, dk->hash_buff_len);
 +#else
 +        EVP_DigestUpdate(dk->mdctx, dk->hash_buff, dk->hash_buff_len);
@@ -94,7 +94,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
        if (dk->canon == DK_CANON_SIMPLE)//if nofws we ignore \r
        {
  #ifndef DK_HASH_BUFF
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
          EVP_DigestUpdate(&dk->mdctx, "\r", 1);
  #else
 +        EVP_DigestUpdate(dk->mdctx, "\r", 1);
@@ -104,7 +104,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
          dk->hash_buff[dk->hash_buff_len++] = '\r';
          if (dk->hash_buff_len >= (DK_BLOCK - 1))
          {
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
            EVP_DigestUpdate(&dk->mdctx, dk->hash_buff, dk->hash_buff_len);
 +#else
 +          EVP_DigestUpdate(dk->mdctx, dk->hash_buff, dk->hash_buff_len);
@@ -116,7 +116,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
        dk->state --;
      }
  #ifndef DK_HASH_BUFF
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
      EVP_DigestUpdate(&dk->mdctx, ptr, 1);
  #else
 +    EVP_DigestUpdate(dk->mdctx, ptr, 1);
@@ -126,7 +126,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
      dk->hash_buff[dk->hash_buff_len++] = *ptr;
      if (dk->hash_buff_len >= (DK_BLOCK - 1))
      {
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
        EVP_DigestUpdate(&dk->mdctx, dk->hash_buff, dk->hash_buff_len);
 +#else
 +      EVP_DigestUpdate(dk->mdctx, dk->hash_buff, dk->hash_buff_len);
@@ -138,14 +138,14 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
      //clean out hash buffer
      dk->hash_buff[dk->hash_buff_len++] = '\r';
      dk->hash_buff[dk->hash_buff_len++] = '\n';
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
      EVP_DigestUpdate(&dk->mdctx, dk->hash_buff, dk->hash_buff_len);
 +#else
 +    EVP_DigestUpdate(dk->mdctx, dk->hash_buff, dk->hash_buff_len);
 +#endif
      dk->hash_buff_len = 0;
  #else
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
      EVP_DigestUpdate(&dk->mdctx, "\r\n", 2);
 +#else
 +    EVP_DigestUpdate(dk->mdctx, "\r\n", 2);
@@ -158,7 +158,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
        }
  
        /* using that key, verify that the digest is properly signed */
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
        i = EVP_VerifyFinal(&dk->mdctx, md_value, md_len, publickey);
 +#else
 +      i = EVP_VerifyFinal(dk->mdctx, md_value, md_len, publickey);
@@ -170,7 +170,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
  
        siglen = EVP_PKEY_size(pkey);
        sig = (unsigned char*) OPENSSL_malloc(siglen);
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
        EVP_SignFinal(&dk->mdctx, sig, &siglen, pkey);
 +#else
 +      EVP_SignFinal(dk->mdctx, sig, &siglen, pkey);
@@ -182,7 +182,7 @@ http://git.pld-linux.org/?p=packages/libdomainkeys.git;a=blob;f=openssl.patch;h=
  #ifdef DK_HASH_BUFF
    DK_MFREE(dk->hash_buff);
  #endif
-+#if OPENSSL_VERSION_NUMBER < 0x1010000fL
++#if OPENSSL_VERSION_NUMBER < 0x10100001L
    EVP_MD_CTX_cleanup(&dk->mdctx);
 +#else
 +  EVP_MD_CTX_free(dk->mdctx);