12 files changed, 36 insertions, 12 deletions
diff --git a/doc/de/includes/autogen_api_hdata.de.adoc b/doc/de/includes/autogen_api_hdata.de.adoc
index 5c98a64a7..873beff98 100644
--- a/doc/de/includes/autogen_api_hdata.de.adoc
+++ b/doc/de/includes/autogen_api_hdata.de.adoc
@@ -233,6 +233,10 @@ _hook_connect_   (pointer, hdata: "hook") +
 _hook_fd_   (pointer, hdata: "hook") +
 _hook_timer_connection_   (pointer, hdata: "hook") +
 _hook_timer_sasl_   (pointer, hdata: "hook") +
+_sasl_scram_client_first_   (string) +
+_sasl_scram_salted_pwd_   (other) +
+_sasl_scram_salted_pwd_size_   (integer) +
+_sasl_scram_auth_message_   (string) +
 _is_connected_   (integer) +
 _ssl_connected_   (integer) +
 _disconnected_   (integer) +
diff --git a/doc/de/includes/autogen_user_options.de.adoc b/doc/de/includes/autogen_user_options.de.adoc
index 93d22ce99..265aa6316 100644
--- a/doc/de/includes/autogen_user_options.de.adoc
+++ b/doc/de/includes/autogen_user_options.de.adoc
@@ -2779,9 +2779,9 @@
 ** Standardwert: `+""+`
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** Beschreibung: pass:none[Verfahren welches bei einer SASL Authentifizierung angewandt werden soll: "plain" Passwort wird im Klartext gesendet, "ecdsa-nist256p-challenge" für öffentlich/private Schlüsselmethode, "external" SSL Zertifikat welches auf Client Seite vorliegt wird verwendet, "dh-blowfish" Passwort wird mittels blowfish verschlüsselt (unsicher, wird nicht empfohlen), "dh-aes" Passwort wird mittels AES verschlüsselt (unsicher, wird nicht empfohlen)]
+** Beschreibung: pass:none[mechanism for SASL authentication: "plain" for plain text password, "scram-sha-1" for SCRAM authentication with SHA-1 algorithm, "scram-sha-256" for SCRAM authentication with SHA-256 algorithm, "scram-sha-512" for SCRAM authentication with SHA-512 algorithm, "ecdsa-nist256p-challenge" for key-based challenge authentication, "external" for authentication using client side SSL cert, "dh-blowfish" for blowfish crypted password (insecure, not recommended), "dh-aes" for AES crypted password (insecure, not recommended)]
 ** Typ: integer
-** Werte: plain, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
+** Werte: plain, scram-sha-1, scram-sha-256, scram-sha-512, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
 ** Standardwert: `+plain+`
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
diff --git a/doc/en/includes/autogen_api_hdata.en.adoc b/doc/en/includes/autogen_api_hdata.en.adoc
index dfac74fda..964cc0766 100644
--- a/doc/en/includes/autogen_api_hdata.en.adoc
+++ b/doc/en/includes/autogen_api_hdata.en.adoc
@@ -233,6 +233,10 @@ _hook_connect_   (pointer, hdata: "hook") +
 _hook_fd_   (pointer, hdata: "hook") +
 _hook_timer_connection_   (pointer, hdata: "hook") +
 _hook_timer_sasl_   (pointer, hdata: "hook") +
+_sasl_scram_client_first_   (string) +
+_sasl_scram_salted_pwd_   (other) +
+_sasl_scram_salted_pwd_size_   (integer) +
+_sasl_scram_auth_message_   (string) +
 _is_connected_   (integer) +
 _ssl_connected_   (integer) +
 _disconnected_   (integer) +
diff --git a/doc/en/includes/autogen_user_options.en.adoc b/doc/en/includes/autogen_user_options.en.adoc
index a61574531..4593d3f1f 100644
--- a/doc/en/includes/autogen_user_options.en.adoc
+++ b/doc/en/includes/autogen_user_options.en.adoc
@@ -2779,9 +2779,9 @@
 ** default value: `+""+`
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** description: pass:none[mechanism for SASL authentication: "plain" for plain text password, "ecdsa-nist256p-challenge" for key-based challenge authentication, "external" for authentication using client side SSL cert, "dh-blowfish" for blowfish crypted password (insecure, not recommended), "dh-aes" for AES crypted password (insecure, not recommended)]
+** description: pass:none[mechanism for SASL authentication: "plain" for plain text password, "scram-sha-1" for SCRAM authentication with SHA-1 algorithm, "scram-sha-256" for SCRAM authentication with SHA-256 algorithm, "scram-sha-512" for SCRAM authentication with SHA-512 algorithm, "ecdsa-nist256p-challenge" for key-based challenge authentication, "external" for authentication using client side SSL cert, "dh-blowfish" for blowfish crypted password (insecure, not recommended), "dh-aes" for AES crypted password (insecure, not recommended)]
 ** type: integer
-** values: plain, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
+** values: plain, scram-sha-1, scram-sha-256, scram-sha-512, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
 ** default value: `+plain+`
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
diff --git a/doc/fr/includes/autogen_api_hdata.fr.adoc b/doc/fr/includes/autogen_api_hdata.fr.adoc
index 2d9ea401d..af2f464b8 100644
--- a/doc/fr/includes/autogen_api_hdata.fr.adoc
+++ b/doc/fr/includes/autogen_api_hdata.fr.adoc
@@ -233,6 +233,10 @@ _hook_connect_   (pointer, hdata: "hook") +
 _hook_fd_   (pointer, hdata: "hook") +
 _hook_timer_connection_   (pointer, hdata: "hook") +
 _hook_timer_sasl_   (pointer, hdata: "hook") +
+_sasl_scram_client_first_   (string) +
+_sasl_scram_salted_pwd_   (other) +
+_sasl_scram_salted_pwd_size_   (integer) +
+_sasl_scram_auth_message_   (string) +
 _is_connected_   (integer) +
 _ssl_connected_   (integer) +
 _disconnected_   (integer) +
diff --git a/doc/fr/includes/autogen_user_options.fr.adoc b/doc/fr/includes/autogen_user_options.fr.adoc
index a0b10f986..81025ff12 100644
--- a/doc/fr/includes/autogen_user_options.fr.adoc
+++ b/doc/fr/includes/autogen_user_options.fr.adoc
@@ -2779,9 +2779,9 @@
 ** valeur par défaut: `+""+`
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** description: pass:none[mécanisme pour l'authentification SASL : "plain" pour un mot de passe en clair, "ecdsa-nist256p-challenge" pour une authentification par challenge avec clé, "external" pour une authentification en utilisant un certificat SSL côté client, "dh-blowfish" pour un mot de passe chiffré avec blowfish (non sûr, non recommandé), "dh-aes" pour un mot de passe chiffré avec AES (non sûr, non recommandé)]
+** description: pass:none[mécanisme pour l'authentification SASL : "plain" pour un mot de passe en clair, "scram-sha-1" pour une authentification SCRAM avec algorithme SHA-1, "scram-sha-256" pour une authentification SCRAM avec algorithme SHA-256, "scram-sha-512" pour une authentification SCRAM avec algorithme SHA-512, "ecdsa-nist256p-challenge" pour une authentification par challenge avec clé, "external" pour une authentification en utilisant un certificat SSL côté client, "dh-blowfish" pour un mot de passe chiffré avec blowfish (non sûr, non recommandé), "dh-aes" pour un mot de passe chiffré avec AES (non sûr, non recommandé)]
 ** type: entier
-** valeurs: plain, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
+** valeurs: plain, scram-sha-1, scram-sha-256, scram-sha-512, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
 ** valeur par défaut: `+plain+`
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
diff --git a/doc/it/includes/autogen_api_hdata.it.adoc b/doc/it/includes/autogen_api_hdata.it.adoc
index c14e135d9..fe2d51aae 100644
--- a/doc/it/includes/autogen_api_hdata.it.adoc
+++ b/doc/it/includes/autogen_api_hdata.it.adoc
@@ -233,6 +233,10 @@ _hook_connect_   (pointer, hdata: "hook") +
 _hook_fd_   (pointer, hdata: "hook") +
 _hook_timer_connection_   (pointer, hdata: "hook") +
 _hook_timer_sasl_   (pointer, hdata: "hook") +
+_sasl_scram_client_first_   (string) +
+_sasl_scram_salted_pwd_   (other) +
+_sasl_scram_salted_pwd_size_   (integer) +
+_sasl_scram_auth_message_   (string) +
 _is_connected_   (integer) +
 _ssl_connected_   (integer) +
 _disconnected_   (integer) +
diff --git a/doc/it/includes/autogen_user_options.it.adoc b/doc/it/includes/autogen_user_options.it.adoc
index fa67adf9d..949c4082b 100644
--- a/doc/it/includes/autogen_user_options.it.adoc
+++ b/doc/it/includes/autogen_user_options.it.adoc
@@ -2779,9 +2779,9 @@
 ** valore predefinito: `+""+`
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** descrizione: pass:none[mechanism for SASL authentication: "plain" for plain text password, "ecdsa-nist256p-challenge" for key-based challenge authentication, "external" for authentication using client side SSL cert, "dh-blowfish" for blowfish crypted password (insecure, not recommended), "dh-aes" for AES crypted password (insecure, not recommended)]
+** descrizione: pass:none[mechanism for SASL authentication: "plain" for plain text password, "scram-sha-1" for SCRAM authentication with SHA-1 algorithm, "scram-sha-256" for SCRAM authentication with SHA-256 algorithm, "scram-sha-512" for SCRAM authentication with SHA-512 algorithm, "ecdsa-nist256p-challenge" for key-based challenge authentication, "external" for authentication using client side SSL cert, "dh-blowfish" for blowfish crypted password (insecure, not recommended), "dh-aes" for AES crypted password (insecure, not recommended)]
 ** tipo: intero
-** valori: plain, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
+** valori: plain, scram-sha-1, scram-sha-256, scram-sha-512, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
 ** valore predefinito: `+plain+`
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
diff --git a/doc/ja/includes/autogen_api_hdata.ja.adoc b/doc/ja/includes/autogen_api_hdata.ja.adoc
index 348f49fa6..c053c974e 100644
--- a/doc/ja/includes/autogen_api_hdata.ja.adoc
+++ b/doc/ja/includes/autogen_api_hdata.ja.adoc
@@ -233,6 +233,10 @@ _hook_connect_   (pointer, hdata: "hook") +
 _hook_fd_   (pointer, hdata: "hook") +
 _hook_timer_connection_   (pointer, hdata: "hook") +
 _hook_timer_sasl_   (pointer, hdata: "hook") +
+_sasl_scram_client_first_   (string) +
+_sasl_scram_salted_pwd_   (other) +
+_sasl_scram_salted_pwd_size_   (integer) +
+_sasl_scram_auth_message_   (string) +
 _is_connected_   (integer) +
 _ssl_connected_   (integer) +
 _disconnected_   (integer) +
diff --git a/doc/ja/includes/autogen_user_options.ja.adoc b/doc/ja/includes/autogen_user_options.ja.adoc
index 7c0c74ed0..6d21162c5 100644
--- a/doc/ja/includes/autogen_user_options.ja.adoc
+++ b/doc/ja/includes/autogen_user_options.ja.adoc
@@ -2779,9 +2779,9 @@
 ** デフォルト値: `+""+`
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** 説明: pass:none[SASL 認証メカニズム: "plain" は平文パスワード、"ecdsa-nist256p-challenge" は鍵を使ったチャレンジ認証、"external" はクライアント側の SSL 証明書を利用した認証<、"dh-blowfish" は blowfish 暗号化パスワード (危険、非推奨)、"dh-aes" は AES 暗号化パスワード (危険、非推奨)]
+** 説明: pass:none[mechanism for SASL authentication: "plain" for plain text password, "scram-sha-1" for SCRAM authentication with SHA-1 algorithm, "scram-sha-256" for SCRAM authentication with SHA-256 algorithm, "scram-sha-512" for SCRAM authentication with SHA-512 algorithm, "ecdsa-nist256p-challenge" for key-based challenge authentication, "external" for authentication using client side SSL cert, "dh-blowfish" for blowfish crypted password (insecure, not recommended), "dh-aes" for AES crypted password (insecure, not recommended)]
 ** タイプ: 整数
-** 値: plain, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
+** 値: plain, scram-sha-1, scram-sha-256, scram-sha-512, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
 ** デフォルト値: `+plain+`
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*
diff --git a/doc/pl/includes/autogen_api_hdata.pl.adoc b/doc/pl/includes/autogen_api_hdata.pl.adoc
index cd97ce55b..dd535008f 100644
--- a/doc/pl/includes/autogen_api_hdata.pl.adoc
+++ b/doc/pl/includes/autogen_api_hdata.pl.adoc
@@ -233,6 +233,10 @@ _hook_connect_   (pointer, hdata: "hook") +
 _hook_fd_   (pointer, hdata: "hook") +
 _hook_timer_connection_   (pointer, hdata: "hook") +
 _hook_timer_sasl_   (pointer, hdata: "hook") +
+_sasl_scram_client_first_   (string) +
+_sasl_scram_salted_pwd_   (other) +
+_sasl_scram_salted_pwd_size_   (integer) +
+_sasl_scram_auth_message_   (string) +
 _is_connected_   (integer) +
 _ssl_connected_   (integer) +
 _disconnected_   (integer) +
diff --git a/doc/pl/includes/autogen_user_options.pl.adoc b/doc/pl/includes/autogen_user_options.pl.adoc
index cf9e2a2dc..87f3fac53 100644
--- a/doc/pl/includes/autogen_user_options.pl.adoc
+++ b/doc/pl/includes/autogen_user_options.pl.adoc
@@ -2779,9 +2779,9 @@
 ** domyślna wartość: `+""+`
 
 * [[option_irc.server_default.sasl_mechanism]] *irc.server_default.sasl_mechanism*
-** opis: pass:none[mechanizm autentykacji SASL: "plain" dla hasła w czystym tekście, "ecdsa-nist256p-challenge" uwierzytelnianie na podstawie pary kluczy, "external" dla uwierzytelnienia za pomocą certyfikatu SSL po stronie klienta",  "dh-blowfish" dla hasła szyfrowanego za pomocą blowfish (mało bezpieczne, niepolecane), "dh-aes" dla hasła szyfrowanego za pomocą AES (mało bezpieczne, niepolecane)]
+** opis: pass:none[mechanism for SASL authentication: "plain" for plain text password, "scram-sha-1" for SCRAM authentication with SHA-1 algorithm, "scram-sha-256" for SCRAM authentication with SHA-256 algorithm, "scram-sha-512" for SCRAM authentication with SHA-512 algorithm, "ecdsa-nist256p-challenge" for key-based challenge authentication, "external" for authentication using client side SSL cert, "dh-blowfish" for blowfish crypted password (insecure, not recommended), "dh-aes" for AES crypted password (insecure, not recommended)]
 ** typ: liczba
-** wartości: plain, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
+** wartości: plain, scram-sha-1, scram-sha-256, scram-sha-512, ecdsa-nist256p-challenge, external, dh-blowfish, dh-aes
 ** domyślna wartość: `+plain+`
 
 * [[option_irc.server_default.sasl_password]] *irc.server_default.sasl_password*