[Pkg-privacy-commits] [msva-perl] 13/15: accept DOS-style CR/LF line endings in PEM-encoded certs

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository msva-perl.

commit b0728b1c6386ae575d868cf7c94272bd704d3719
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Sep 9 02:17:29 2013 -0400

    accept DOS-style CR/LF line endings in PEM-encoded certs
---
 Changelog                  | 1 +
 Crypt/Monkeysphere/MSVA.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Changelog b/Changelog
index 98b7d8c..cde02bf 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,7 @@ msva-perl (0.9.2) upstream;
   * openpgp2x509: a bit more clean up and features (needs more work)
   * handle multiple keyserver entries in gpg.conf gracefully
     (closes MS #6252)
+  * also accept DOS-style CR/LF line endings in PEM-encoded X.509 certs
 
  -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Mon, 09 Sep 2013 01:16:47 -0400
 
diff --git a/Crypt/Monkeysphere/MSVA.pm b/Crypt/Monkeysphere/MSVA.pm
index 173a041..63f3b69 100755
--- a/Crypt/Monkeysphere/MSVA.pm
+++ b/Crypt/Monkeysphere/MSVA.pm
@@ -461,7 +461,7 @@
 
   sub pem2der {
     my $pem = shift;
-    my @lines = split(/\n/, $pem);
+    my @lines = split(/\r?\n/, $pem);
     my @goodlines = ();
     my $ready = 0;
     foreach my $line (@lines) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/msva-perl.git