From 3efb28665793d55a7f75e0b577da58bd695aecf0 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Tue, 7 Apr 2015 10:18:17 +0100 Subject: [PATCH] Delete 0001-Workaround-for-X509Certificate.RSA-throwing-an-unhan.patch (fixed upstream) Former-commit-id: 84e2a9523bded310f7ee66df6ee2c862438ba085 --- ...509Certificate.RSA-throwing-an-unhan.patch | 42 ------------------- debian/patches/series | 1 - 2 files changed, 43 deletions(-) delete mode 100644 debian/patches/0001-Workaround-for-X509Certificate.RSA-throwing-an-unhan.patch diff --git a/debian/patches/0001-Workaround-for-X509Certificate.RSA-throwing-an-unhan.patch b/debian/patches/0001-Workaround-for-X509Certificate.RSA-throwing-an-unhan.patch deleted file mode 100644 index af3f5280a1..0000000000 --- a/debian/patches/0001-Workaround-for-X509Certificate.RSA-throwing-an-unhan.patch +++ /dev/null @@ -1,42 +0,0 @@ -From afcb0baec2182503ed8de016bd6225cbb1c74191 Mon Sep 17 00:00:00 2001 -From: Jo Shields -Date: Mon, 19 Jan 2015 14:32:22 +0000 -Subject: [PATCH] Workaround for X509Certificate.RSA throwing an unhandled - exception in ASN1 parsing of certificates with ECC public keys only. - ---- - mcs/class/Mono.Security/Mono.Security.X509/X509Certificate.cs | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mcs/class/Mono.Security/Mono.Security.X509/X509Certificate.cs b/mcs/class/Mono.Security/Mono.Security.X509/X509Certificate.cs -index 11be419..da39f9a 100644 ---- a/mcs/class/Mono.Security/Mono.Security.X509/X509Certificate.cs -+++ b/mcs/class/Mono.Security/Mono.Security.X509/X509Certificate.cs -@@ -247,7 +247,7 @@ namespace Mono.Security.X509 { - if (m_keyalgoparams == null) - throw new CryptographicException ("Missing key algorithm parameters."); - -- if (_dsa == null) { -+ if (_dsa == null && m_keyalgo == "1.2.840.10040.4.1") { - DSAParameters dsaParams = new DSAParameters (); - // for DSA m_publickey contains 1 ASN.1 integer - Y - ASN1 pubkey = new ASN1 (m_publickey); -@@ -327,7 +327,7 @@ namespace Mono.Security.X509 { - - public virtual RSA RSA { - get { -- if (_rsa == null) { -+ if (_rsa == null && m_keyalgo == "1.2.840.113549.1.1.1") { - RSAParameters rsaParams = new RSAParameters (); - // for RSA m_publickey contains 2 ASN.1 integers - // the modulus and the public exponent -@@ -560,4 +560,4 @@ namespace Mono.Security.X509 { - return Convert.FromBase64String (base64); - } - } --} -\ No newline at end of file -+} --- -1.9.1 - diff --git a/debian/patches/series b/debian/patches/series index d29aaf26e3..7b1297eec4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -0001-Workaround-for-X509Certificate.RSA-throwing-an-unhan.patch 0001-Fix-build-on-s390.patch