[PATCH 1/2] secur32: Added support for a few more algorithms in schannel_get_cipher_algid.

[Hugh McMaster]

On Tue, 16 Jun 2015 13:46:32 +0200, Jacek Caban wrote:
> -    case GNUTLS_CIPHER_AES_256_CBC: return CALG_AES;
> +    case GNUTLS_CIPHER_AES_128_GCM: return CALG_AES_128;
> +    case GNUTLS_CIPHER_AES_192_CBC: return CALG_AES_192;
> +    case GNUTLS_CIPHER_AES_256_GCM:
> +    case GNUTLS_CIPHER_AES_256_CBC: return CALG_AES_256;

Those changes are causing fatal build errors in Wine:

schannel_gnutls.c: In function ‘schannel_get_cipher_algid’:
schannel_gnutls.c:272:10: error: ‘GNUTLS_CIPHER_AES_128_GCM’ undeclared (first use in this function)
     case GNUTLS_CIPHER_AES_128_GCM: return CALG_AES_128;
          ^
schannel_gnutls.c:272:10: note: each undeclared identifier is reported only once for each function it appears in
schannel_gnutls.c:274:10: error: ‘GNUTLS_CIPHER_AES_256_GCM’ undeclared (first use in this function)
     case GNUTLS_CIPHER_AES_256_GCM:
          ^
make[1]: *** [schannel_gnutls.o] Error 1
make[1]: Leaving directory `/home/hugh/wine-test/dlls/secur32'
make: *** [dlls/secur32] Error 2

--
Hugh McMaster

[Jacek Caban]

Hi Hugh,

On 06/17/15 07:11, Hugh McMaster wrote:
> On Tue, 16 Jun 2015 13:46:32 +0200, Jacek Caban wrote:
> > -    case GNUTLS_CIPHER_AES_256_CBC: return CALG_AES;
> > +    case GNUTLS_CIPHER_AES_128_GCM: return CALG_AES_128;
> > +    case GNUTLS_CIPHER_AES_192_CBC: return CALG_AES_192;
> > +    case GNUTLS_CIPHER_AES_256_GCM:
> > +    case GNUTLS_CIPHER_AES_256_CBC: return CALG_AES_256;
> > Those changes are causing fatal build errors in Wine:
>
> schannel_gnutls.c: In function ‘schannel_get_cipher_algid’:
> schannel_gnutls.c:272:10: error: ‘GNUTLS_CIPHER_AES_128_GCM’ undeclared (first use in this function)
>      case GNUTLS_CIPHER_AES_128_GCM: return CALG_AES_128;
>           ^
> schannel_gnutls.c:272:10: note: each undeclared identifier is reported only once for each function it appears in
> schannel_gnutls.c:274:10: error: ‘GNUTLS_CIPHER_AES_256_GCM’ undeclared (first use in this function)
>      case GNUTLS_CIPHER_AES_256_GCM:
>           ^
> make[1]: *** [schannel_gnutls.o] Error 1
> make[1]: Leaving directory `/home/hugh/wine-test/dlls/secur32'
> make: *** [dlls/secur32] Error 2

I sent a fix, please test [1].

BTW, while investigating it, I found that we will have more
compatibility issues in the future. It seems that gnutls doesn't
consider backward compatibility seriously [2].

Cheers,
Jacek

[1] http://source.winehq.org/patches/data/112128
[2]
https://gitlab.com/gnutls/gnutls/commit/b604a9093bccf933baba125634034a6d4ce9...

[Henri Verbeet]

On 17 June 2015 at 11:52, Jacek Caban <jacek(a)codeweavers.com> wrote:
> BTW, while investigating it, I found that we will have more
> compatibility issues in the future. It seems that gnutls doesn't
> consider backward compatibility seriously [2].
>
> Cheers,
> Jacek
>
> [1] http://source.winehq.org/patches/data/112128
> [2]
> https://gitlab.com/gnutls/gnutls/commit/b604a9093bccf933baba125634034a6d4ce9...

I don't know how much GnuTLS does or doesn't care about backwards
compatibility, but note that the commit you're referring to comes
right after one bumping the soversion.

[Hugh McMaster]

Hi Jacek,

On Wed, 17 Jun 2015 11:52:20 +0200, Jacek Caban wrote:
> I sent a fix, please test [1].
>
> BTW, while investigating it, I found that we will have more
> compatibility issues in the future. It seems that gnutls doesn't
> consider backward compatibility seriously [2].

Your patch compiles fine, but triggers warnings:

schannel_gnutls.c: In function ‘schannel_get_cipher_algid’:
schannel_gnutls.c:275:5: warning: case value ‘93’ not in enumerated type ‘gnutls_cipher_algorithm_t’ [-Wswitch]
     case GNUTLS_CIPHER_AES_128_GCM: return CALG_AES_128;
     ^
schannel_gnutls.c:277:5: warning: case value ‘94’ not in enumerated type ‘gnutls_cipher_algorithm_t’ [-Wswitch]
     case GNUTLS_CIPHER_AES_256_GCM:

I'm on Linux Mint 17. It uses a Trusty base. libgnutls-dev version is 2.12.23 (-12ubuntu2.2)

[Jacek Caban]

On 06/17/15 12:57, Hugh McMaster wrote:
> Hi Jacek,
>
> On Wed, 17 Jun 2015 11:52:20 +0200, Jacek Caban wrote:
> > I sent a fix, please test [1].
> >
> > BTW, while investigating it, I found that we will have more
> > compatibility issues in the future. It seems that gnutls doesn't
> > consider backward compatibility seriously [2].
>
> Your patch compiles fine, but triggers warnings:
>
> schannel_gnutls.c: In function ‘schannel_get_cipher_algid’:
> schannel_gnutls.c:275:5: warning: case value ‘93’ not in enumerated
> type ‘gnutls_cipher_algorithm_t’ [-Wswitch]
>      case GNUTLS_CIPHER_AES_128_GCM: return CALG_AES_128;
>      ^
> schannel_gnutls.c:277:5: warning: case value ‘94’ not in enumerated
> type ‘gnutls_cipher_algorithm_t’ [-Wswitch]
>      case GNUTLS_CIPHER_AES_256_GCM:
>
> I'm on Linux Mint 17. It uses a Trusty base. libgnutls-dev version is
> 2.12.23 (-12ubuntu2.2)

Fixed in the new patch:
http://source.winehq.org/patches/data/112130

Cheers,
Jacek

[Hugh McMaster]

On Wed, 17 Jun 2015 13:08:35 +0200, Jacek Caban wrote:
> Fixed in the new patch:
> http://source.winehq.org/patches/data/112130

This version compiles without warnings.

Thank you.