Make non-standard SCRAM SHA algos opt-in

Author: rufferson

meson.build

@@ -109,6 +109,10 @@ if get_option('debug')
   defines += 'ENABLE_DEBUG'
 endif
 
+if get_option('nonstandard-scram')
+  defines += 'WOCKY_SCRAM_NONSTANDARD'
+endif
+
 if get_option('google-relay')
   defines += 'ENABLE_GOOGLE_RELAY'
 endif

meson_options.txt

@@ -4,3 +4,4 @@ option('code-style-check', type: 'boolean', description: 'enable coding style ch
 option('install-headers', type: 'string', description: 'install development headers here')
 option('libdir-suffix', type: 'string', description: 'install a shared library into project-specific subdir')
 option('google-relay', type: 'boolean', value: false, description: 'enable google jingle relay support', yield: true)
+option('nonstandard-scram', type: 'boolean', value: false, description: 'enable non-standard scram methods', yield: true)

wocky/wocky-auth-registry.c

@@ -309,8 +309,10 @@ wocky_auth_registry_select_handler (WockyAuthRegistry *self,
     gboolean is_plus;
     GChecksumType algo;
   } scram_handlers[] = {
+#ifdef WOCKY_AUTH_MECH_SASL_SCRAM_SHA_512
     { WOCKY_AUTH_MECH_SASL_SCRAM_SHA_512_PLUS, TRUE, G_CHECKSUM_SHA512 },
     { WOCKY_AUTH_MECH_SASL_SCRAM_SHA_512, FALSE, G_CHECKSUM_SHA512 },
+#endif
 #ifdef WOCKY_AUTH_MECH_SASL_SCRAM_SHA_384
     { WOCKY_AUTH_MECH_SASL_SCRAM_SHA_384_PLUS, TRUE, G_CHECKSUM_SHA384 },
     { WOCKY_AUTH_MECH_SASL_SCRAM_SHA_384, FALSE, G_CHECKSUM_SHA384 },

wocky/wocky-auth-registry.h

@@ -62,12 +62,14 @@ typedef enum
 #define WOCKY_AUTH_MECH_SASL_SCRAM_SHA_1_PLUS "SCRAM-SHA-1-PLUS"
 #define WOCKY_AUTH_MECH_SASL_SCRAM_SHA_256 "SCRAM-SHA-256"
 #define WOCKY_AUTH_MECH_SASL_SCRAM_SHA_256_PLUS "SCRAM-SHA-256-PLUS"
+#ifdef WOCKY_SCRAM_NONSTANDARD
 #define WOCKY_AUTH_MECH_SASL_SCRAM_SHA_512 "SCRAM-SHA-512"
 #define WOCKY_AUTH_MECH_SASL_SCRAM_SHA_512_PLUS "SCRAM-SHA-512-PLUS"
 #if GLIB_VERSION_CUR_STABLE >= GLIB_VERSION_2_52
 #define WOCKY_AUTH_MECH_SASL_SCRAM_SHA_384 "SCRAM-SHA-384"
 #define WOCKY_AUTH_MECH_SASL_SCRAM_SHA_384_PLUS "SCRAM-SHA-384-PLUS"
 #endif
+#endif
 
 /**
  * WockyTLSBindingType