devs/libstrophe-gh-mirror
2
0
Fork 0
mirror of https://github.com/strophe/libstrophe.git synced 2026-08-05 03:16:21 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

Disable SCRAM PLUS variants when using schannel.

Browse Source 
This fixes #270

Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
This commit is contained in:
Steffen Jaeckel
2026-07-29 09:03:09 +02:00
parent 6e219ef46c
commit 419b616b87
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@@ -17,7 +17,9 @@ if TLS_WITH_GNUTLS
SSL_CFLAGS = @gnutls_CFLAGS@ SSL_CFLAGS = @gnutls_CFLAGS@
SSL_LIBS = @gnutls_LIBS@ SSL_LIBS = @gnutls_LIBS@
else else
if !TLS_WITH_SCHANNEL if TLS_WITH_SCHANNEL
SSL_CFLAGS = -DSTROPHE_TLS_SCHANNEL
else
SSL_CFLAGS = @openssl_CFLAGS@ SSL_CFLAGS = @openssl_CFLAGS@
SSL_LIBS = @openssl_LIBS@ SSL_LIBS = @openssl_LIBS@
endif endif

2
src/scram.c
View File

@@ -93,12 +93,14 @@ const struct hash_alg scram_sha512_plus = {
* https://datatracker.ietf.org/doc/html/draft-ietf-kitten-password-storage * https://datatracker.ietf.org/doc/html/draft-ietf-kitten-password-storage
*/ */
const struct hash_alg *scram_algs[] = { const struct hash_alg *scram_algs[] = {
#if !defined(STROPHE_TLS_SCHANNEL)
/* *1 */ /* *1 */
&scram_sha512_plus, &scram_sha512_plus,
/* *1 */ /* *1 */
&scram_sha256_plus, &scram_sha256_plus,
/* *1 */ /* *1 */
&scram_sha1_plus, &scram_sha1_plus,
#endif
/* *1 */ /* *1 */
&scram_sha512, &scram_sha512,
/* *1 */ /* *1 */