diohsc 0.1.14.1 → 0.1.14.2
raw patch · 4 files changed
+19/−6 lines, 4 filesdep ~bytestring
Dependency ranges changed: bytestring
Files
- GeminiProtocol.hs +7/−0
- Makefile +1/−1
- Version.hs +1/−1
- diohsc.cabal +10/−4
GeminiProtocol.hs view
@@ -8,6 +8,7 @@ -- You should have received a copy of the GNU General Public License -- along with this program. If not, see http://www.gnu.org/licenses/. +{-# LANGUAGE CPP #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TupleSections #-}@@ -66,7 +67,9 @@ import URI import Util +#ifdef DRUNKEN_BISHOP import Data.Digest.DrunkenBishop+#endif defaultGeminiPort :: Int defaultGeminiPort = 1965@@ -437,6 +440,7 @@ hex = ("0123456789abcdef" !!) . fromIntegral in hex a : hex b : "" fingerprintPicture :: Fingerprint -> [String]+#ifdef DRUNKEN_BISHOP fingerprintPicture (Fingerprint fp) = boxedDrunkenBishop fp where boxedDrunkenBishop :: BS.ByteString -> [String] boxedDrunkenBishop s = ["+-----[X509]------+"]@@ -445,6 +449,9 @@ drunkenBishopPreHashed :: BS.ByteString -> String drunkenBishopPreHashed = drunkenBishopWithOptions $ drunkenBishopDefaultOptions { drunkenBishopHash = id }+#else+ fingerprintPicture _ = []+#endif -- |those ciphers from ciphersuite_default fitting the requirements -- recommended by the gemini "best practices" document:
Makefile view
@@ -1,4 +1,4 @@-VERSION=0.1.14.1+VERSION=0.1.14.2 GHCOPTS=-threaded -DICONV -DMAGIC -ignore-package regex-compat-tdfa
Version.hs view
@@ -16,4 +16,4 @@ programName = "diohsc" version :: String-version = "0.1.14.1"+version = "0.1.14.2"
diohsc.cabal view
@@ -1,6 +1,6 @@ cabal-version: 1.18 name: diohsc-version: 0.1.14.1+version: 0.1.14.2 license: GPL-3 license-file: COPYING maintainer: mbays@sdf.org@@ -27,7 +27,11 @@ flag libiconv description: Use libiconv for charset conversion+ default: True +flag drunken-bishop+ description:+ Show ascii art pictures of server certificates default: True flag magic@@ -39,7 +43,6 @@ description: Allow IRIs in gemtext links (preparing for likely spec change). Punycoding is not currently supported.- default: False manual: True @@ -88,13 +91,12 @@ base >=4.3 && <5, asn1-encoding <0.10, asn1-types >=0.3.4 && <0.4,- bytestring >=0.10.4.0 && <0.12,+ bytestring >=0.10.4.0 && <0.13, containers >=0.5.5.1 && <0.7, cryptonite >=0.26 && <0.31, data-default-class >=0.1.2.0 && <0.2, hashable >= 1.1 && <1.5, directory >=1.2.1.0 && <1.4,- drunken-bishop >=0.1.0.0 && <0.2, exceptions >=0.10.4 && <0.11, filepath >=1.3.0.2 && <1.5, haskeline ==0.8.*,@@ -136,3 +138,7 @@ if flag(libiconv) cpp-options: -DICONV build-depends: iconv >=0.4.1.3 && <0.5++ if flag(drunken-bishop)+ cpp-options: -DDRUNKEN_BISHOP+ build-depends: drunken-bishop >=0.1.0.0 && <0.2