get android building the security fix
Had to update http-client and network, with follow-on dep changes. This commit was sponsored by Brock Spratlen on Patreon.
This commit is contained in:
parent
991265e724
commit
22f49f216e
13 changed files with 469 additions and 460 deletions
|
@ -0,0 +1,28 @@
|
|||
From 717945172c2f3ff95cce9db2d075122bccfc9a1a Mon Sep 17 00:00:00 2001
|
||||
From: androidbuilder <androidbuilder@example.com>
|
||||
Date: Wed, 20 Jun 2018 02:01:30 +0100
|
||||
Subject: [PATCH] support Android cert store
|
||||
|
||||
Android has only hashsed cert files.
|
||||
See https://github.com/vincenthz/hs-certificate/issues/19
|
||||
---
|
||||
Data/X509/CertificateStore.hs | 2 +-
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
delete mode 100644 Data/X509/.CertificateStore.hs.swp
|
||||
|
||||
diff --git a/Data/X509/CertificateStore.hs b/Data/X509/CertificateStore.hs
|
||||
index 07449a2..74b8bde 100644
|
||||
--- a/Data/X509/CertificateStore.hs
|
||||
+++ b/Data/X509/CertificateStore.hs
|
||||
@@ -106,7 +106,7 @@ listDirectoryCerts path =
|
||||
&& isDigit (s !! 9)
|
||||
&& (s !! 8) == '.'
|
||||
&& all isHexDigit (take 8 s)
|
||||
- isCert x = (not $ isPrefixOf "." x) && (not $ isHashedFile x)
|
||||
+ isCert x = (not $ isPrefixOf "." x)
|
||||
|
||||
getDirContents = E.catch (map (path </>) . filter isCert <$> getDirectoryContents path) emptyPaths
|
||||
where emptyPaths :: E.IOException -> IO [FilePath]
|
||||
--
|
||||
2.1.4
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue