[Bug 53366] New: Can't compile AES-CCM support prior to GNUTLS version 3.4.0

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53366

Bug ID: 53366
           Summary: Can't compile AES-CCM support prior to GNUTLS version
                    3.4.0
           Product: Wine
           Version: 7.12
          Hardware: x86-64
                OS: Linux
            Status: NEW
          Severity: normal
          Priority: P2
         Component: secur32
          Assignee: [e-mail]
          Reporter: [e-mail]
      Distribution: ---

Created attachment 72752
  --> https://bugs.winehq.org/attachment.cgi?id=72752
Patch makes AES-CCM conditional to GNUTLS version >= 3.4.0

Hello,

AES-CCM support was added in GNUTLS version 3.4.0 [1]

Since commit 99e2f4caca474d14efd55e6a008bd57c720e0fd7, compiling on GNUTLS
3.3.30 (shipped with Debian 8) fails with undefined GNUTLS_CIPHER_AES_128_CCM
and GNUTLS_CIPHER_AES_256_CCM in dlls/secur32/schannel_gnutls.c.

The attached patch fixes the compilation error by adding conditional
pre-processor statements around them.

[1] https://www.gnutls.org/abi-tracker/changelog/gnutls/3.4.4/log.html

Regards.

[Bug 53366] Can't compile AES-CCM support prior to GNUTLS version 3.4.0

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53366

Olivier F. R. Dierick  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
    Regression SHA1|                            |99e2f4caca474d14efd55e6a008
                   |                            |bd57c720e0fd7
       Distribution|---                         |Debian
           Keywords|                            |regression

[Bug 53366] Can't compile AES-CCM support prior to GNUTLS version 3.4.0

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53366

--- Comment #1 from Hans Leidekker  ---
Thanks. Instead of the repeated ifdef's I'd prefer to define them once at the
top of the file. Look at how it's done for GNUTLS_CIPHER_AES_192_CBC for
example.

[Bug 53366] Can't compile AES-CCM support prior to GNUTLS version 3.4.0

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53366

Olivier F. R. Dierick  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #72752|0                           |1
        is obsolete|                            |

--- Comment #2 from Olivier F. R. Dierick  ---
Created attachment 72756
  --> https://bugs.winehq.org/attachment.cgi?id=72756
Patch defines AES-CCM ciphers constants for GNUTLS < 3.4.0

Hello,

It also works like this.

Regards.

[Bug 53366] Can't compile AES-CCM support prior to GNUTLS version 3.4.0

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53366

--- Comment #3 from Hans Leidekker  ---
(In reply to Olivier F. R. Dierick from comment #2)
> Created attachment 72756 [details]
> Patch defines AES-CCM ciphers constants for GNUTLS < 3.4.0
>
> Hello,
>
> It also works like this.

Yes, that's what I meant. Please submit the patch.

[Bug 53366] Can't compile AES-CCM support prior to GNUTLS version 3.4.0

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53366

Olivier F. R. Dierick  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
      Fixed by SHA1|                            |8f3352ed91a8723989864a643aa
                   |                            |b22a4fe2f0ddd
         Resolution|---                         |FIXED

--- Comment #4 from Olivier F. R. Dierick  ---
Hello,

Fixed by commit 8f3352ed91a8723989864a643aab22a4fe2f0ddd.

Regards.

[Bug 53366] Can't compile AES-CCM support prior to GNUTLS version 3.4.0

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53366

Alexandre Julliard  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #5 from Alexandre Julliard  ---
Closing bugs fixed in 7.15.