From 9d9d7ab575e4ff06b63c4b0fccfb1d4098cff785 Mon Sep 17 00:00:00 2001
From: Dominic Hargreaves <dom@earth.li>
Date: Sun, 30 Dec 2012 15:38:53 +0000
Subject: Replace Digest::SHA1 with Digest::SHA

Debian no longer ships Digest::SHA1, and Digest::SHA is a core
module starting with perl 5.10.

Bug-Debian: http://bugs.debian.org/694476
Patch-Name: digest-sha
---
 lib/MT.pm                      |    8 ++++----
 lib/MT/App/Wizard.pm           |    4 ++--
 lib/MT/AtomServer.pm           |    4 ++--
 lib/MT/Auth/OpenID.pm          |    4 ++--
 lib/MT/CMS/Blog.pm             |    2 +-
 lib/MT/L10N/de.pm              |    8 ++++++--
 lib/MT/L10N/es.pm              |    8 ++++++--
 lib/MT/L10N/fr.pm              |    6 +++---
 lib/MT/L10N/ja.pm              |    8 ++++++--
 lib/MT/L10N/nl.pm              |    8 ++++++--
 mt-check.cgi                   |    4 ++--
 tmpl/cms/cfg_registration.tmpl |    2 +-
 12 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/lib/MT.pm b/lib/MT.pm
index c772bcd..b647953 100644
--- a/lib/MT.pm
+++ b/lib/MT.pm
@@ -2758,11 +2758,11 @@ sub _commenter_auth_params {
 
 sub _openid_commenter_condition {
     my ( $blog, $reason ) = @_;
-    eval { require Digest::SHA1; };
+    eval { require Digest::SHA; };
     return 1 unless $@;
     $$reason
         = MT->translate(
-        'The Perl module required for OpenID commenter authentication (Digest::SHA1) is missing.'
+        'The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.'
         );
     return 0;
 }
@@ -2807,8 +2807,8 @@ sub core_commenter_authenticators {
             condition  => sub {
                 my ( $blog, $reason ) = @_;
                 my @missing;
-                eval { require Digest::SHA1; };
-                push @missing, 'Digest::SHA1' if $@;
+                eval { require Digest::SHA; };
+                push @missing, 'Digest::SHA' if $@;
                 eval { require Crypt::SSLeay; };
                 push @missing, 'Crypt::SSLeay' if $@;
                 return 1 unless @missing;
diff --git a/lib/MT/App/Wizard.pm b/lib/MT/App/Wizard.pm
index 45cadda..6563e66 100644
--- a/lib/MT/App/Wizard.pm
+++ b/lib/MT/App/Wizard.pm
@@ -310,8 +310,8 @@ sub init_core_registry {
                 label =>
                     'This module and its dependencies are required in order to restore from a backup.',
             },
-            'Digest::SHA1' => {
-                link => 'http://search.cpan.org/dist/Digest-SHA1',
+            'Digest::SHA' => {
+                link => 'http://search.cpan.org/dist/Digest-SHA',
                 label =>
                     'This module and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.',
             },
diff --git a/lib/MT/AtomServer.pm b/lib/MT/AtomServer.pm
index af71f8b..52b371c 100644
--- a/lib/MT/AtomServer.pm
+++ b/lib/MT/AtomServer.pm
@@ -11,7 +11,7 @@ use XML::Atom;
 use XML::Atom::Util qw( first textValue );
 use base qw( MT::App );
 use MIME::Base64 ();
-use Digest::SHA1 ();
+use Digest::SHA ();
 use MT::Atom;
 use MT::Util qw( encode_xml );
 use MT::Author;
@@ -199,7 +199,7 @@ sub authenticate {
         return $app->auth_failure( 403, 'X-WSSE UsernameToken timed out' );
     }
     $auth->{Nonce} = MIME::Base64::decode_base64( $auth->{Nonce} );
-    my $expected = Digest::SHA1::sha1_base64(
+    my $expected = Digest::SHA::sha1_base64(
         $auth->{Nonce} . $auth->{Created} . $user->api_password );
 
     # Some base64 implementors do it wrong and don't put the =
diff --git a/lib/MT/Auth/OpenID.pm b/lib/MT/Auth/OpenID.pm
index 22273f7..eb9ec3a 100644
--- a/lib/MT/Auth/OpenID.pm
+++ b/lib/MT/Auth/OpenID.pm
@@ -392,8 +392,8 @@ sub _asset_from_url {
     unless ( $fmgr->exists($local_path) ) {
         $fmgr->mkpath($local_path);
     }
-    require Digest::SHA1;
-    my $filename = Digest::SHA1::sha1_hex($image_url);
+    require Digest::SHA;
+    my $filename = Digest::SHA::sha1_hex($image_url);
     unless ($ext) { # trust content type higher than url extension
         ($ext) = $image_url =~ m!(\.[^\.\\\/])$!;
     }
diff --git a/lib/MT/CMS/Blog.pm b/lib/MT/CMS/Blog.pm
index a7998c2..6a2d589 100644
--- a/lib/MT/CMS/Blog.pm
+++ b/lib/MT/CMS/Blog.pm
@@ -492,7 +492,7 @@ sub cfg_registration {
     return $app->permission_denied()
         unless $app->can_do('edit_config');
 
-    eval { require Digest::SHA1; };
+    eval { require Digest::SHA; };
     my $openid_available = $@ ? 0 : 1;
 
     my %param = ();
diff --git a/lib/MT/L10N/de.pm b/lib/MT/L10N/de.pm
index 0a2c6f3..0a23c51 100644
--- a/lib/MT/L10N/de.pm
+++ b/lib/MT/L10N/de.pm
@@ -194,7 +194,7 @@ use vars qw( @ISA %Lexicon );
 	'IO::Uncompress::Gunzip is required in order to decompress files during restore operation.' => 'IO::Uncompress::Gzip ist zum Entpacken von Backup-Dateien erforderlich.',
 	'Archive::Zip is required in order to manipulate files during backup and restore operations.' => 'Archive::Zip ist für Dateioperationen beim Erstellen und Einspielen von Backups erforderlich.',
 	'XML::SAX and its dependencies are required to restore a backup created in a backup/restore operation.' => 'XML::SAX und seine Abhängigkeiten sind zum Einspielen von Backups erforderlich.',
-	'Digest::SHA1 and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.' => 'Digest::SHA1 und seine Abhängigkeiten sind zur Authentifizierung mittels OpenID (einschließlich LiveJournal) erforderlich.',
+	'Digest::SHA and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.' => 'Digest::SHA und seine Abhängigkeiten sind zur Authentifizierung mittels OpenID (einschließlich LiveJournal) erforderlich.',
 	'Net::SMTP is required in order to send mail via an SMTP Server.' => 'Net::SMTP ist für den Versand von E-Mails über SMTP-Server erforderlich.',
 	'This module and its dependencies are required in order to support CRAM-MD5, DIGEST-MD5 or LOGIN SASL mechanisms.' => 'Dieses Modul und seine Abhängigkeiten sind zur Verwendung von CRAM-MD5, DIGEST-MD5 und LOGIN SASL erforderlich.',
 	'Net::SMTP::SSL is required to use SMTP Auth over an SSL connection.' => 'Net::SMTP::SSL ist zur Verwendung von SMTP Auth über SSL erforderlich.',
@@ -2093,7 +2093,7 @@ use vars qw( @ISA %Lexicon );
 	'Loading of blog \'[_1]\' failed: [_2]' => 'Blog &#8222;[_1]&#8220; konnte nicht geladen werden: [_2]',
 	'Loading template \'[_1]\' failed.' => 'Die Vorlage &#8222;[_1]&#8220; konnte nicht geladen werden.',
 	'Error while creating email: [_1]' => 'Fehler beim Anlegen einer E-Mail: [_1]',
-	'The Perl module required for OpenID commenter authentication (Digest::SHA1) is missing.' => 'Das zur OpenID-Authentifizierung erforderliche Perl-Modul Digest::SHA1 fehlt.',
+	'The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.' => 'Das zur OpenID-Authentifizierung erforderliche Perl-Modul Digest::SHA fehlt.',
 	'missing required Perl modules: [_1]' => 'Fehlende erforderliche Perl-Module: [_1]', # Translate - New # OK
 	'http://www.movabletype.org/documentation/' => 'http://www.movabletype.org/documentation/',
 	'OpenID' => 'OpenID',
@@ -3427,6 +3427,10 @@ use vars qw( @ISA %Lexicon );
 	'(No role selected)' => '(Keine Rolle gewählt)',
 	'Select roles' => 'Rollen awählen',
 	'Authentication Methods' => 'Authentifizierungs- methoden',
+<<<<<<< bd2681c79a4573e2946c78a1cca1abe506123d30
+=======
+	'The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.' => 'Das zur OpenID-Authentifizierung erforderliche Perl-Modul Digest::SHA fehlt.',
+>>>>>>> HEAD~0
 	'Please select authentication methods to accept comments.' => 'Wählen Sie, auf welche Weise sich Kommentar-Autoren authentifizieren können sollen.',
 	'Require E-mail Address for Comments via TypePad' => 'Für über TypePad eingehende Kommentare E-Mail-Adresse des Autors verlangen',
 	'Visitors must allow their TypePad account to share their e-mail address when commenting.' => 'Zur Anmeldung über TypePad muss das TypePad-Benutzerkonto so konfiguriert sein, daß es die E-Mail-Adresse des Autors übermittelt.',
diff --git a/lib/MT/L10N/es.pm b/lib/MT/L10N/es.pm
index 029759d..d784f63 100644
--- a/lib/MT/L10N/es.pm
+++ b/lib/MT/L10N/es.pm
@@ -194,7 +194,7 @@ use vars qw( @ISA %Lexicon );
 	'IO::Uncompress::Gunzip is required in order to decompress files during restore operation.' => 'IO::Uncompress::Gunzip es necesario para descomprimir ficheros durante la operación de restauración.',
 	'Archive::Zip is required in order to manipulate files during backup and restore operations.' => 'Archive::Zip es necesario para manipular ficheros durante las operaciones de copias de seguridad y restauraciones.',
 	'XML::SAX and its dependencies are required to restore a backup created in a backup/restore operation.' => 'XML::SAX y sus dependencias son necesarias para restaurar una copia de seguridad creada en una operación de copia de seguridad/restauración.',
-	'Digest::SHA1 and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.' => 'Digest::SHA1 y sus dependencias son necesarias para que los comentaristas se autentifiquen mediante proveedores OpenID, incluyendo LiveJournal.',
+	'Digest::SHA and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.' => 'Digest::SHA y sus dependencias son necesarias para que los comentaristas se autentifiquen mediante proveedores OpenID, incluyendo LiveJournal.',
 	'Net::SMTP is required in order to send mail via an SMTP Server.' => 'Net::SMTP es necesario para enviar correos vía servidores SMTP.',
 	'This module and its dependencies are required in order to support CRAM-MD5, DIGEST-MD5 or LOGIN SASL mechanisms.' => 'Este módulo y sus dependencias son necesarios para dar soporte a los mecanismos CRAM-MD5, DIGEST-MD5 o LOGIN SASL.',
 	'Net::SMTP::SSL is required to use SMTP Auth over an SSL connection.' => 'Net::SMTP::SSL es necesario para usar autentificación SMTP con una conexión SSL.',
@@ -2099,7 +2099,7 @@ No se pudo escribir el fichero. Disco lleno.",
 	'Loading of blog \'[_1]\' failed: [_2]' => 'Falló la carga del blog \'[_1]\': [_2]',
 	'Loading template \'[_1]\' failed.' => 'Fallo cargando la plantilla \'[_1]\'.',
 	'Error while creating email: [_1]' => 'Error durante la creación del correo: [_1]',
-	'The Perl module required for OpenID commenter authentication (Digest::SHA1) is missing.' => 'El módulo de Perl necesario para la autentificación de comentaristas mendiante OpenID (Digest::SHA1) no está instalado.',
+	'The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.' => 'El módulo de Perl necesario para la autentificación de comentaristas mendiante OpenID (Digest::SHA) no está instalado.',
 	'missing required Perl modules: [_1]' => 'faltan módulos de Perl requeridos: [_1]', # Translate - New
 	'http://www.movabletype.org/documentation/' => 'http://www.movabletype.org/documentation/',
 	'OpenID' => 'OpenID',
@@ -3433,6 +3433,10 @@ No se pudo escribir el fichero. Disco lleno.",
 	'(No role selected)' => '(Sin rol seleccionado',
 	'Select roles' => 'Seleccionar roles',
 	'Authentication Methods' => 'Métodos de autentificación',
+<<<<<<< bd2681c79a4573e2946c78a1cca1abe506123d30
+=======
+	'The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.' => 'El módulo de Perl necesario para la autentificación de comentaristas mendiante OpenID (Digest::SHA) no está instalado.',
+>>>>>>> HEAD~0
 	'Please select authentication methods to accept comments.' => 'Por favor, seleccione los métodos de autentificación para aceptar comentarios.',
 	'Require E-mail Address for Comments via TypePad' => 'Requerir la dirección de correo de los comentarios a través de TypePad',
 	'Visitors must allow their TypePad account to share their e-mail address when commenting.' => 'Los visitantes deben permitir a su cuenta de TypePad compartir la dirección de correo al comentar.',
diff --git a/lib/MT/L10N/fr.pm b/lib/MT/L10N/fr.pm
index d1c9683..2cf04b0 100644
--- a/lib/MT/L10N/fr.pm
+++ b/lib/MT/L10N/fr.pm
@@ -194,7 +194,7 @@ use vars qw( @ISA %Lexicon );
 	'IO::Uncompress::Gunzip is required in order to decompress files during restore operation.' => 'IO::Uncompress::Gunzip est nécessaire pour décomprimer les fichiers lors des opérations de restauration.',
 	'Archive::Zip is required in order to manipulate files during backup and restore operations.' => 'Archive::Zip est nécessaire pour manipuler les fichiers lors des opérations de sauvegarde et de restauration.',
 	'XML::SAX and its dependencies are required to restore a backup created in a backup/restore operation.' => 'XML::SAX et ses dépendances sont nécessaires pour restaurer un fichier créé lors d\'une opération de sauvegarde.',
-	'Digest::SHA1 and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.' => 'Digest::SHA1 et ses dépendances sont requises afin de permettre aux auteurs de commentaire d\'être identifiés en utilisant les fournisseurs OpenID, comme LiveJournal.',
+	'Digest::SHA and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.' => 'Digest::SHA et ses dépendances sont requises afin de permettre aux auteurs de commentaire d\'être identifiés en utilisant les fournisseurs OpenID, comme LiveJournal.',
 	'Net::SMTP is required in order to send mail via an SMTP Server.' => 'Net::SMTP est nécessaire pour envoyer du courriel via un serveur SMTP.',
 	'This module and its dependencies are required in order to support CRAM-MD5, DIGEST-MD5 or LOGIN SASL mechanisms.' => 'Ce module et ses dépendances sont requis pour utiliser les mécanismes CRAM-MD5, DIGEST-MD5 ou LOGIN SASL.',
 	'Net::SMTP::SSL is required to use SMTP Auth over an SSL connection.' => 'Net::SMTP::SSL est requis pour l\'authentification SMTP via une connexion SSL.',
@@ -2099,7 +2099,7 @@ Impossible d\'enregistrer le fichier. Le disque est plein.",
 	'Loading of blog \'[_1]\' failed: [_2]' => 'Le chargement du blog \'[_1]\' a échoué : [_2]',
 	'Loading template \'[_1]\' failed.' => 'Le chargement du template \'[_1]\' a échoué.',
 	'Error while creating email: [_1]' => 'Erreur à la création de l\'e-mail : [_1]',
-	'The Perl module required for OpenID commenter authentication (Digest::SHA1) is missing.' => 'Le module Perl nécessaire pour l\'authentification OpenID (Digest::SHA1) est manquant.',
+	'The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.' => 'Le module Perl nécessaire pour l\'authentification OpenID (Digest::SHA) est manquant.',
 	'missing required Perl modules: [_1]' => 'modules Perl requis et manquants : [_1]', # Translate - New
 	'http://www.movabletype.org/documentation/' => 'http://www.movabletype.org/documentation/',
 	'OpenID' => 'OpenID',
@@ -3437,7 +3437,7 @@ Impossible d\'enregistrer le fichier. Le disque est plein.",
 	'(No role selected)' => '(aucun role sélectionné)',
 	'Select roles' => 'Sélectionnez des rôles',
 	q{Authentication Methods} => q{Méthode d'authentification},
-	q{The Perl module required for OpenID commenter authentication (Digest::SHA1) is missing.} => q{Le module Perl nécessaire pour l'authentification OpenID (Digest::SHA1) est manquant.},
+	q{The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.} => q{Le module Perl nécessaire pour l'authentification OpenID (Digest::SHA) est manquant.},
 	q{Please select authentication methods to accept comments.} => q{Veuillez sélectionner les méthodes d'authorisation acceptées pour les commentaires.},
 	'Require E-mail Address for Comments via TypePad' => 'Demander une adresse e-mail pour les commentaires via TypePad',
 	q{Visitors must allow their TypePad account to share their e-mail address when commenting.} => q{Les visiteurs doivent autoriser leur compte TypePad à partager leur adresse e-mail lorsqu'ils commentent.},
diff --git a/lib/MT/L10N/ja.pm b/lib/MT/L10N/ja.pm
index 0aecd68..f6f5016 100644
--- a/lib/MT/L10N/ja.pm
+++ b/lib/MT/L10N/ja.pm
@@ -194,7 +194,7 @@ use vars qw( @ISA %Lexicon );
 	'IO::Uncompress::Gunzip is required in order to decompress files during restore operation.' => 'IO::Uncompress::Gunzipのインストールは必須ではありません。バックアップと復元で圧縮の機能を利用する場合に必要となります。',
 	'Archive::Zip is required in order to manipulate files during backup and restore operations.' => 'Archive::Zipのインストールは必須ではありません。バックアップと復元で圧縮の機能を利用する場合に必要となります。',
 	'XML::SAX and its dependencies are required to restore a backup created in a backup/restore operation.' => 'XML::SAXは復元の機能を利用する場合に必要となります。',
-	'Digest::SHA1 and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.' => 'Digest::SHA1のインストールは必須ではありませんが、LiveJournal、あるいはOpenIDでコメント投稿者を認証するために必要になります。',
+	'Digest::SHA and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.' => 'Digest::SHAのインストールは必須ではありませんが、LiveJournal、あるいはOpenIDでコメント投稿者を認証するために必要になります。',
 	'Net::SMTP is required in order to send mail via an SMTP Server.' => 'メールの送信にSMTPを利用する場合に必要になります。',
 	'This module and its dependencies are required in order to support CRAM-MD5, DIGEST-MD5 or LOGIN SASL mechanisms.' => 'Authen::SASLとその依存モジュールはCRAM-MD5、DIGEST-MD5又はLOGINをSASLメカニズムとして利用する場合に必要となります。',
 	'Net::SMTP::SSL is required to use SMTP Auth over an SSL connection.' => 'Net::SMTP::SSLはSMTP認証にSSLを利用する場合に必要となります。',
@@ -565,7 +565,7 @@ use vars qw( @ISA %Lexicon );
 	'Loading of blog \'[_1]\' failed: [_2]' => 'ブログ(ID:[_1])をロードできませんでした: [_2]',
 	'Loading template \'[_1]\' failed.' => 'テンプレート「[_1]」のロードに失敗しました。',
 	'Error while creating email: [_1]' => 'メールの再構築中にエラーが発生しました: [_1]',
-	'The Perl module required for OpenID commenter authentication (Digest::SHA1) is missing.' => 'OpenIDを利用するのに必要なPerlモジュール(Digest::SHA1)がありません。',
+	'The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.' => 'OpenIDを利用するのに必要なPerlモジュール(Digest::SHA)がありません。',
 	'missing required Perl modules: [_1]' => '必要なPerlモジュールが見つかりません: [_1]',
 	'http://www.movabletype.org/documentation/' => 'http://www.movabletype.jp/documentation/',
 	'An error occurred: [_1]' => 'エラーが発生しました: [_1]',
@@ -3428,6 +3428,10 @@ use vars qw( @ISA %Lexicon );
 	'(No role selected)' => '(ロールが選択されていません)',
 	'Select roles' => 'ロール選択',
 	'Authentication Methods' => '認証方式',
+<<<<<<< bd2681c79a4573e2946c78a1cca1abe506123d30
+=======
+	'The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.' => 'OpenIDを利用するのに必要なPerlモジュール(Digest::SHA)がありません。',
+>>>>>>> HEAD~0
 	'Please select authentication methods to accept comments.' => 'コメント投稿者の認証方式を選択してください。',
 	'Require E-mail Address for Comments via TypePad' => 'TypePad経由のコメントにメールアドレスを要求する',
 	'Visitors must allow their TypePad account to share their e-mail address when commenting.' => 'ビジターはコメント時にメールアドレスを共有するのにTypePadアカウントが許可されています。',
diff --git a/lib/MT/L10N/nl.pm b/lib/MT/L10N/nl.pm
index e4e47a9..12ddc77 100644
--- a/lib/MT/L10N/nl.pm
+++ b/lib/MT/L10N/nl.pm
@@ -194,7 +194,7 @@ use vars qw( @ISA %Lexicon );
 	'IO::Uncompress::Gunzip is required in order to decompress files during restore operation.' => 'IO::Uncompress:Gunzip is vereist om bestanden te kunnen decomprimeren tijdens restore-operaties.',
 	'Archive::Zip is required in order to manipulate files during backup and restore operations.' => 'Archive::Zip is vereist om bestanden te kunnen manipuleren tijdens backup en restore operaties.',
 	'XML::SAX and its dependencies are required to restore a backup created in a backup/restore operation.' => 'XML::SAX en de modules die er van afhangen zijn vereist om een backup te kunnen terugzetten die werd gemaakt tijdens een backup/restore operatie.',
-	'Digest::SHA1 and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.' => 'Digest::SHA1 en de daarvoor benodigde bestanden zijn vereist om reageerders te kunnen toestaan zich aan te melden via OpenID providers, waaronder LiveJournal.',
+	'Digest::SHA and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.' => 'Digest::SHA en de daarvoor benodigde bestanden zijn vereist om reageerders te kunnen toestaan zich aan te melden via OpenID providers, waaronder LiveJournal.',
 	'Net::SMTP is required in order to send mail via an SMTP Server.' => 'Net::SMTP is vereist om mail te kunnen versturen via een SMTP server.',
 	'This module and its dependencies are required in order to support CRAM-MD5, DIGEST-MD5 or LOGIN SASL mechanisms.' => 'Deze modules en de modules waar deze van afhangt zijn vereist om CRM-MD5, DIGEST-MD5 of LOGIN SASL te ondersteunen.',
 	'Net::SMTP::SSL is required to use SMTP Auth over an SSL connection.' => 'Net::SMTP::SSL is vereist om SMTP Auth te kunnen gebruiken over een SSL verbinding.',
@@ -2095,7 +2095,7 @@ Kan bestand niet schrijven.  Schijf vol.",
 	'Loading of blog \'[_1]\' failed: [_2]' => 'Laden van blog \'[_1]\' mislukt: [_2]',
 	'Loading template \'[_1]\' failed.' => 'Laden van sjabloon \'[_1]\' mislukt.',
 	'Error while creating email: [_1]' => 'Fout bij het aanmaken van email: [_1]',
-	'The Perl module required for OpenID commenter authentication (Digest::SHA1) is missing.' => 'De perl module die vereist is voor authenticatie van reageerders via OpenID (Digest::SHA1) ontbreekt.',
+	'The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.' => 'De perl module die vereist is voor authenticatie van reageerders via OpenID (Digest::SHA) ontbreekt.',
 	'missing required Perl modules: [_1]' => 'ontbrekende vereiste Perl modules: [_1]', # Translate - New
 	'http://www.movabletype.org/documentation/' => 'http://www.movabletype.org/documentation/',
 	'OpenID' => 'OpenID',
@@ -3429,6 +3429,10 @@ Kan bestand niet schrijven.  Schijf vol.",
 	'(No role selected)' => '(Geen rol geselecteerd)',
 	'Select roles' => 'Selecteer rollen',
 	'Authentication Methods' => 'Methodes voor authenticatie',
+<<<<<<< bd2681c79a4573e2946c78a1cca1abe506123d30
+=======
+	'The Perl module required for OpenID commenter authentication (Digest::SHA) is missing.' => 'De perl module die vereist is voor authenticatie van reageerders via OpenID (Digest::SHA) ontbreekt.',
+>>>>>>> HEAD~0
 	'Please select authentication methods to accept comments.' => 'Gelieve een authenticatiemethode te selecteren om reacties te kunnen ontvangen.',
 	'Require E-mail Address for Comments via TypePad' => 'E-mail adres vereisen voor reacties via TypePad',
 	'Visitors must allow their TypePad account to share their e-mail address when commenting.' => 'Bezoekers moeten hun TypePad account toestaan om hun e-mail adres te delen als ze willen reageren.',
diff --git a/mt-check.cgi b/mt-check.cgi
index 419504e..401d9f4 100755
--- a/mt-check.cgi
+++ b/mt-check.cgi
@@ -680,10 +680,10 @@ my @CORE_OPT = (
         )
     ],
 
-    [   'Digest::SHA1',
+    [   'Digest::SHA',
         0, 0,
         translate(
-            'Digest::SHA1 and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.'
+            'Digest::SHA and its dependencies are required in order to allow commenters to be authenticated by OpenID providers including LiveJournal.'
         )
     ],
 
diff --git a/tmpl/cms/cfg_registration.tmpl b/tmpl/cms/cfg_registration.tmpl
index 00bb5af..8181bf7 100644
--- a/tmpl/cms/cfg_registration.tmpl
+++ b/tmpl/cms/cfg_registration.tmpl
@@ -69,7 +69,7 @@
      id="setting-auth-status"
      label="<__trans phrase="Authentication Methods">">
   <mt:unless name="openid_enabled">
-    <p class="alert-warning-inline icon-left icon-warning"><__trans phrase="The Perl module required for OpenID commenter authentication (Digest::SHA1) is missing."></p>
+    <p class="alert-warning-inline icon-left icon-warning"><__trans phrase="The Perl module required for OpenID commenter authentication (Digest::SHA) is missing."></p>
   </mt:unless>
   <mt:unless name="commenter_authenticators">
     <mt:if name="allow_reg_comments">
