commit ghc-x509 for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-x509 for openSUSE:Factory checked in at 2020-09-07 22:04:34 Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old) and /work/SRC/openSUSE:Factory/.ghc-x509.new.3399 (New) Package is "ghc-x509" Mon Sep 7 22:04:34 2020 rev:18 rq:832341 version:1.7.5 Changes: --- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2020-08-28 21:41:24.716888013 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-x509.new.3399/ghc-x509.changes 2020-09-07 22:04:35.546127742 +0200 @@ -1,0 +2,6 @@ +Mon Aug 31 09:34:30 UTC 2020 - psim...@suse.com + +- Update x509 to version 1.7.5 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +--- Other differences: --
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2020-08-28 21:41:24
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new.3399 (New)
Package is "ghc-x509"
Fri Aug 28 21:41:24 2020 rev:17 rq:829498 version:1.7.5
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2020-06-19
17:21:13.359512371 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new.3399/ghc-x509.changes
2020-08-28 21:41:24.716888013 +0200
@@ -1,0 +2,5 @@
+Tue Aug 18 10:46:40 UTC 2020 - Peter Simons
+
+- Replace %setup -q with the more modern %autosetup macro.
+
+---
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.6n4b2C/_old 2020-08-28 21:41:25.196888189 +0200
+++ /var/tmp/diff_new_pack.6n4b2C/_new 2020-08-28 21:41:25.200888190 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-x509
#
-# Copyright (c) 2019 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -57,7 +57,7 @@
This package provides the Haskell %{pkg_name} library development files.
%prep
-%setup -q -n %{pkg_name}-%{version}
+%autosetup -n %{pkg_name}-%{version}
cp -p %{SOURCE1} %{pkg_name}.cabal
%build
commit ghc-x509 for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-x509 for openSUSE:Factory checked in at 2020-06-19 17:21:10 Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old) and /work/SRC/openSUSE:Factory/.ghc-x509.new.3606 (New) Package is "ghc-x509" Fri Jun 19 17:21:10 2020 rev:16 rq:815218 version:1.7.5 Changes: --- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2019-12-27 13:59:08.816825832 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-x509.new.3606/ghc-x509.changes 2020-06-19 17:21:13.359512371 +0200 @@ -1,0 +2,5 @@ +Tue Jun 16 11:14:51 UTC 2020 - Peter Simons + +- Re-generate file with latest version of spec-cleaner. + +--- Other differences: -- ++ ghc-x509.spec ++ --- /var/tmp/diff_new_pack.f2Y2I1/_old 2020-06-19 17:21:14.619516106 +0200 +++ /var/tmp/diff_new_pack.f2Y2I1/_new 2020-06-19 17:21:14.623516117 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-x509 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2019-12-27 13:59:08
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new.6675 (New)
Package is "ghc-x509"
Fri Dec 27 13:59:08 2019 rev:15 rq:759560 version:1.7.5
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2018-12-24
11:37:32.617657029 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new.6675/ghc-x509.changes
2019-12-27 13:59:08.816825832 +0100
@@ -1,0 +2,5 @@
+Fri Nov 8 16:15:13 UTC 2019 - Peter Simons
+
+- Drop obsolete group attributes.
+
+---
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.MhUNtU/_old 2019-12-27 13:59:09.272826052 +0100
+++ /var/tmp/diff_new_pack.MhUNtU/_new 2019-12-27 13:59:09.272826052 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-x509
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,6 @@
Release:0
Summary:X509 reader and writer
License:BSD-3-Clause
-Group: Development/Libraries/Haskell
URL:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
@@ -49,7 +48,6 @@
%package devel
Summary:Haskell %{pkg_name} library development files
-Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2018-12-24 11:37:31
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new.28833 (New)
Package is "ghc-x509"
Mon Dec 24 11:37:31 2018 rev:14 rq:658881 version:1.7.5
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2018-11-09
07:53:02.791805636 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new.28833/ghc-x509.changes
2018-12-24 11:37:32.617657029 +0100
@@ -1,0 +2,5 @@
+Fri Dec 14 15:32:18 UTC 2018 - Peter Simons
+
+- Update Cabal build instructions for more accurate dependencies on base.
+
+---
New:
x509.cabal
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.KM55g3/_old 2018-12-24 11:37:33.177656532 +0100
+++ /var/tmp/diff_new_pack.KM55g3/_new 2018-12-24 11:37:33.181656528 +0100
@@ -26,6 +26,7 @@
Group: Development/Libraries/Haskell
URL:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-asn1-encoding-devel
BuildRequires: ghc-asn1-parse-devel
@@ -59,6 +60,7 @@
%prep
%setup -q -n %{pkg_name}-%{version}
+cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++ x509.cabal ++
Name:x509
version: 1.7.5
x-revision: 1
Description: X509 reader and writer. please see README
License: BSD3
License-file:LICENSE
Copyright: Vincent Hanquez
Author: Vincent Hanquez
Maintainer: Vincent Hanquez
Synopsis:X509 reader and writer
Build-Type: Simple
Category:Data
stability: experimental
Homepage:http://github.com/vincenthz/hs-certificate
Cabal-Version: >= 1.10
Library
Default-Language: Haskell2010
Build-Depends: base >= 4.7 && < 5
, bytestring
, memory
, mtl
, containers
, hourglass
, pem >= 0.1
, asn1-types >= 0.3.1 && < 0.4
, asn1-encoding >= 0.9 && < 0.10
, asn1-parse >= 0.9.3 && < 0.10
, cryptonite >= 0.24
Exposed-modules: Data.X509
Data.X509.EC
Other-modules: Data.X509.Internal
Data.X509.CertificateChain
Data.X509.AlgorithmIdentifier
Data.X509.DistinguishedName
Data.X509.Cert
Data.X509.PublicKey
Data.X509.PrivateKey
Data.X509.Ext
Data.X509.ExtensionRaw
Data.X509.CRL
Data.X509.OID
Data.X509.Signed
ghc-options: -Wall
Test-Suite test-x509
Default-Language: Haskell2010
type: exitcode-stdio-1.0
hs-source-dirs:Tests
Main-is: Tests.hs
Build-Depends: base >= 3 && < 5
, bytestring
, mtl
, tasty
, tasty-quickcheck
, hourglass
, asn1-types
, x509
, cryptonite
ghc-options: -Wall -fno-warn-orphans -fno-warn-missing-signatures
source-repository head
type: git
location: git://github.com/vincenthz/hs-certificate
subdir: x509
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2018-11-09 07:53:02
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new (New)
Package is "ghc-x509"
Fri Nov 9 07:53:02 2018 rev:13 rq:646364 version:1.7.5
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2018-10-25
08:19:32.631986403 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2018-11-09
07:53:02.791805636 +0100
@@ -1,0 +2,6 @@
+Mon Nov 5 03:01:21 UTC 2018 - psim...@suse.com
+
+- Update x509 to version 1.7.5.
+ Upstream does not provide a change log file.
+
+---
Old:
x509-1.7.4.tar.gz
x509.cabal
New:
x509-1.7.5.tar.gz
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.CWAc6F/_old 2018-11-09 07:53:03.303805047 +0100
+++ /var/tmp/diff_new_pack.CWAc6F/_new 2018-11-09 07:53:03.307805043 +0100
@@ -19,14 +19,13 @@
%global pkg_name x509
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.7.4
+Version:1.7.5
Release:0
Summary:X509 reader and writer
License:BSD-3-Clause
Group: Development/Libraries/Haskell
URL:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-asn1-encoding-devel
BuildRequires: ghc-asn1-parse-devel
@@ -60,7 +59,6 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
++ x509-1.7.4.tar.gz -> x509-1.7.5.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.7.4/Data/X509/AlgorithmIdentifier.hs
new/x509-1.7.5/Data/X509/AlgorithmIdentifier.hs
--- old/x509-1.7.4/Data/X509/AlgorithmIdentifier.hs 2018-07-21
10:17:34.0 +0200
+++ new/x509-1.7.5/Data/X509/AlgorithmIdentifier.hs 2018-11-04
11:10:41.0 +0100
@@ -31,14 +31,20 @@
| PubKeyALG_RSAPSS -- ^ RSA PSS Key algorithm (RFC 3447)
| PubKeyALG_DSA -- ^ DSA Public Key algorithm
| PubKeyALG_EC -- ^ ECDSA & ECDH Public Key algorithm
+| PubKeyALG_X25519 -- ^ ECDH 25519 key agreement
+| PubKeyALG_X448-- ^ ECDH 448 key agreement
+| PubKeyALG_Ed25519 -- ^ EdDSA 25519 signature algorithm
+| PubKeyALG_Ed448 -- ^ EdDSA 448 signature algorithm
| PubKeyALG_DH -- ^ Diffie Hellman Public Key algorithm
| PubKeyALG_Unknown OID -- ^ Unknown Public Key algorithm
deriving (Show,Eq)
--- | Signature Algorithm often composed of
--- a public key algorithm and a hash algorithm
+-- | Signature Algorithm, often composed of a public key algorithm and a hash
+-- algorithm. For some signature algorithms the hash algorithm is intrinsic to
+-- the public key algorithm and is not needed in the data type.
data SignatureALG =
SignatureALG HashALG PubKeyALG
+| SignatureALG_IntrinsicHash PubKeyALG
| SignatureALG_Unknown OID
deriving (Show,Eq)
@@ -47,6 +53,10 @@
getObjectID PubKeyALG_RSAPSS = [1,2,840,113549,1,1,10]
getObjectID PubKeyALG_DSA= [1,2,840,10040,4,1]
getObjectID PubKeyALG_EC = [1,2,840,10045,2,1]
+getObjectID PubKeyALG_X25519= [1,3,101,110]
+getObjectID PubKeyALG_X448 = [1,3,101,111]
+getObjectID PubKeyALG_Ed25519 = [1,3,101,112]
+getObjectID PubKeyALG_Ed448 = [1,3,101,113]
getObjectID PubKeyALG_DH = [1,2,840,10046,2,1]
getObjectID (PubKeyALG_Unknown oid) = oid
@@ -71,6 +81,8 @@
, ([2,16,840,1,101,3,4,2,4], SignatureALG HashSHA224 PubKeyALG_RSAPSS)
, ([2,16,840,1,101,3,4,3,1], SignatureALG HashSHA224 PubKeyALG_DSA)
, ([2,16,840,1,101,3,4,3,2], SignatureALG HashSHA256 PubKeyALG_DSA)
+, ([1,3,101,112], SignatureALG_IntrinsicHash PubKeyALG_Ed25519)
+, ([1,3,101,113], SignatureALG_IntrinsicHash PubKeyALG_Ed448)
]
oidSig :: OID -> SignatureALG
@@ -99,6 +111,6 @@
Right (oidSig hash1, xs)
fromASN1 _ =
Left "fromASN1: X509.SignatureALG: unknown format"
-toASN1 signatureAlg@(SignatureALG hashAlg PubKeyALG_RSAPSS) = \xs -> Start
Sequence:OID [1,2,840,113549,1,1,10]:Start Sequence:Start (Container Context
0):Start Sequence:OID (sigOID signatureAlg):End Sequence:End (Container Context
0):Start (Container Context 1): Start Sequence:OID [1,2,840,113549,1,1,8]:Start
Seq
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2018-10-25 08:19:28
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new (New)
Package is "ghc-x509"
Thu Oct 25 08:19:28 2018 rev:12 rq:642906 version:1.7.4
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2018-07-21
10:24:25.286969080 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2018-10-25
08:19:32.631986403 +0200
@@ -1,0 +2,6 @@
+Wed Oct 10 19:23:53 UTC 2018 - psim...@suse.com
+
+- Update x509 to version 1.7.4.
+ Upstream does not provide a change log file.
+
+---
Old:
x509-1.7.3.tar.gz
New:
x509-1.7.4.tar.gz
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.Ys2tXW/_old 2018-10-25 08:19:33.787985890 +0200
+++ /var/tmp/diff_new_pack.Ys2tXW/_new 2018-10-25 08:19:33.791985889 +0200
@@ -12,14 +12,14 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global pkg_name x509
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.7.3
+Version:1.7.4
Release:0
Summary:X509 reader and writer
License:BSD-3-Clause
@@ -45,7 +45,7 @@
%endif
%description
-X509 reader and writer.
+X509 reader and writer. please see README.
%package devel
Summary:Haskell %{pkg_name} library development files
++ x509-1.7.3.tar.gz -> x509-1.7.4.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.7.3/Data/X509/PrivateKey.hs
new/x509-1.7.4/Data/X509/PrivateKey.hs
--- old/x509-1.7.3/Data/X509/PrivateKey.hs 2017-07-31 22:17:24.0
+0200
+++ new/x509-1.7.4/Data/X509/PrivateKey.hs 2018-09-13 23:10:49.0
+0200
@@ -13,8 +13,21 @@
, privkeyToAlg
) where
+import Control.Applicative ((<$>), pure)
+import Data.Word (Word)
+
+import qualified Data.ByteString as B
+
+import Data.ASN1.Types
+import Data.ASN1.Encoding
+import Data.ASN1.BinaryEncoding
+import Data.ASN1.BitArray
+
import Data.X509.AlgorithmIdentifier
import Data.X509.PublicKey (SerializedPoint(..))
+import Data.X509.OID (lookupByOID, curvesOIDTable)
+
+import Crypto.Number.Serialize (i2osp, os2ip)
import qualified Crypto.PubKey.RSA as RSA
import qualified Crypto.PubKey.DSA as DSA
import qualified Crypto.PubKey.ECC.Types as ECC
@@ -46,9 +59,192 @@
| PrivKeyEC PrivKeyEC -- ^ EC private key
deriving (Show,Eq)
+instance ASN1Object PrivKey where
+fromASN1 = privkeyFromASN1
+toASN1 = privkeyToASN1
+
+privkeyFromASN1 :: [ASN1] -> Either String (PrivKey, [ASN1])
+privkeyFromASN1 asn1 =
+ (mapFst PrivKeyRSA <$> rsaFromASN1 asn1)
+ (mapFst PrivKeyDSA <$> dsaFromASN1 asn1)
+ (mapFst PrivKeyEC <$> ecdsaFromASN1 asn1)
+ where
+mapFst f (a, b) = (f a, b)
+
+Left _ b = b
+a _ = a
+
+rsaFromASN1 :: [ASN1] -> Either String (RSA.PrivateKey, [ASN1])
+rsaFromASN1 (Start Sequence : IntVal 0 : IntVal n : IntVal e : IntVal d
+: IntVal p : IntVal q : IntVal dP : IntVal dQ : IntVal qinv
+: End Sequence : as) = pure (key, as)
+ where
+key = RSA.PrivateKey (RSA.PublicKey (go n 1) n e) d p q dP dQ qinv
+go m i
+| 2 ^ (i * 8) > m = i
+| otherwise = go m (i + 1)
+rsaFromASN1 (Start Sequence : IntVal 0 : Start Sequence
+: OID [1, 2, 840, 113549, 1, 1, 1] : Null : End Sequence
+: OctetString bytes : End Sequence : as) = do
+asn1 <- mapLeft failure (decodeASN1' BER bytes)
+fmap (const as) <$> rsaFromASN1 asn1
+ where
+failure = ("rsaFromASN1: " ++) . show
+rsaFromASN1 _ = Left "rsaFromASN1: unexpected format"
+
+dsaFromASN1 :: [ASN1] -> Either String (DSA.PrivateKey, [ASN1])
+dsaFromASN1 (Start Sequence : IntVal 0 : IntVal p : IntVal q : IntVal g
+: IntVal _ : IntVal x : End Sequence : as) =
+pure (DSA.PrivateKey (DSA.Params p g q) x, as)
+dsaFromASN1 (Start Sequence : IntVal 0 : Start Sequence
+: OID [1, 2, 840, 10040, 4, 1] : Start Sequence : IntVal p : IntVal q
+: IntVal g : End Sequence : End Sequence : OctetString bytes
+: End Sequence : as) = case decodeASN1' BER bytes of
+Right [IntVal x] -> pure (DSA.PrivateKey (DSA.Params p g q) x, as)
+Right _ -> Left "DSA.PrivateKey.fromASN1: unexpected format"
+Left e -> Left $ "DSA.PrivateKey.fromASN1: " ++ show e
+dsaFromASN1 _ = Left "DSA.PrivateKey.fromASN1: unexpected format"
+
+
commit ghc-x509 for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-x509 for openSUSE:Factory checked in at 2018-07-21 10:24:23 Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old) and /work/SRC/openSUSE:Factory/.ghc-x509.new (New) Package is "ghc-x509" Sat Jul 21 10:24:23 2018 rev:11 rq:623895 version:1.7.3 Changes: --- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2018-05-30 12:27:55.372985115 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2018-07-21 10:24:25.286969080 +0200 @@ -1,0 +2,6 @@ +Wed Jul 18 14:26:48 UTC 2018 - psim...@suse.com + +- Cosmetic: replace tabs with blanks, strip trailing white space, + and update copyright headers with spec-cleaner. + +--- @@ -51 +56,0 @@ - Other differences: --
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2018-05-30 12:15:52
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new (New)
Package is "ghc-x509"
Wed May 30 12:15:52 2018 rev:10 rq:607925 version:1.7.3
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2017-08-31
21:01:48.230396550 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2018-05-30
12:27:55.372985115 +0200
@@ -1,0 +2,6 @@
+Mon May 14 17:02:11 UTC 2018 - psim...@suse.com
+
+- Update x509 to version 1.7.3 revision 1.
+ Upstream does not provide a changelog.
+
+---
Old:
x509-1.7.1.tar.gz
New:
x509-1.7.3.tar.gz
x509.cabal
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.EjlWny/_old 2018-05-30 12:27:56.188956369 +0200
+++ /var/tmp/diff_new_pack.EjlWny/_new 2018-05-30 12:27:56.192956228 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-x509
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,13 +19,14 @@
%global pkg_name x509
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.7.1
+Version:1.7.3
Release:0
Summary:X509 reader and writer
License:BSD-3-Clause
-Group: Development/Languages/Other
-Url:https://hackage.haskell.org/package/%{pkg_name}
+Group: Development/Libraries/Haskell
+URL:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+Source1:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-asn1-encoding-devel
BuildRequires: ghc-asn1-parse-devel
@@ -38,7 +39,6 @@
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-pem-devel
BuildRequires: ghc-rpm-macros
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-tasty-devel
BuildRequires: ghc-tasty-quickcheck-devel
@@ -49,7 +49,7 @@
%package devel
Summary:Haskell %{pkg_name} library development files
-Group: Development/Libraries/Other
+Group: Development/Libraries/Haskell
Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
@@ -60,6 +60,7 @@
%prep
%setup -q -n %{pkg_name}-%{version}
+cp -p %{SOURCE1} %{pkg_name}.cabal
%build
%ghc_lib_build
@@ -77,10 +78,8 @@
%ghc_pkg_recache
%files -f %{name}.files
-%defattr(-,root,root,-)
-%doc LICENSE
+%license LICENSE
%files devel -f %{name}-devel.files
-%defattr(-,root,root,-)
%changelog
++ x509-1.7.1.tar.gz -> x509-1.7.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.7.1/Data/X509/AlgorithmIdentifier.hs
new/x509-1.7.3/Data/X509/AlgorithmIdentifier.hs
--- old/x509-1.7.1/Data/X509/AlgorithmIdentifier.hs 2017-06-26
18:12:09.0 +0200
+++ new/x509-1.7.3/Data/X509/AlgorithmIdentifier.hs 2017-07-31
22:20:34.0 +0200
@@ -95,6 +95,8 @@
Right (oidSig oid, xs)
fromASN1 (Start Sequence:OID [1,2,840,113549,1,1,10]:Start Sequence:Start
_:Start Sequence:OID hash1:End Sequence:End _:Start _:Start Sequence:OID
[1,2,840,113549,1,1,8]:Start Sequence:OID _hash2:End Sequence:End Sequence:End
_:Start _: IntVal _iv: End _: End Sequence : End Sequence:xs) =
Right (oidSig hash1, xs)
+fromASN1 (Start Sequence:OID [1,2,840,113549,1,1,10]:Start Sequence:Start
_:Start Sequence:OID hash1:Null:End Sequence:End _:Start _:Start Sequence:OID
[1,2,840,113549,1,1,8]:Start Sequence:OID _hash2:Null:End Sequence:End
Sequence:End _:Start _: IntVal _iv: End _: End Sequence : End Sequence:xs) =
+Right (oidSig hash1, xs)
fromASN1 _ =
Left "fromASN1: X509.SignatureALG: unknown format"
toASN1 signatureAlg@(SignatureALG hashAlg PubKeyALG_RSAPSS) = \xs -> Start
Sequence:OID [1,2,840,113549,1,1,10]:Start Sequence:Start (Container Context
0):Start Sequence:OID (sigOID signatureAlg):End Sequence:End (Container Context
0):Start (Container Context 1): Start Sequence:OID [1,2,840,113549,1,1,8]:Start
Sequence:OID (sigOID signatureAlg):End Sequence:End Sequence:End (Container
Context 1):Start (Container Context 2):IntVal (saltLen hashAlg):En
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2017-08-31 21:01:47
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new (New)
Package is "ghc-x509"
Thu Aug 31 21:01:47 2017 rev:9 rq:513540 version:1.7.1
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2017-01-12
15:53:04.994828527 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2017-08-31
21:01:48.230396550 +0200
@@ -1,0 +2,5 @@
+Thu Jul 27 14:07:19 UTC 2017 - psim...@suse.com
+
+- Update to version 1.7.1.
+
+---
Old:
x509-1.6.5.tar.gz
New:
x509-1.7.1.tar.gz
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.mw8w3y/_old 2017-08-31 21:01:49.534213361 +0200
+++ /var/tmp/diff_new_pack.mw8w3y/_new 2017-08-31 21:01:49.55023 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-x509
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%global pkg_name x509
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.6.5
+Version:1.7.1
Release:0
Summary:X509 reader and writer
License:BSD-3-Clause
++ x509-1.6.5.tar.gz -> x509-1.7.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.6.5/Data/X509/Ext.hs
new/x509-1.7.1/Data/X509/Ext.hs
--- old/x509-1.6.5/Data/X509/Ext.hs 2016-12-03 08:26:55.0 +0100
+++ new/x509-1.7.1/Data/X509/Ext.hs 2017-07-21 18:29:07.0 +0200
@@ -8,7 +8,7 @@
-- extension processing module.
--
{-# LANGUAGE FlexibleContexts #-}
-
+{-# LANGUAGE ScopedTypeVariables #-}
module Data.X509.Ext
( Extension(..)
-- * Common extension usually found in x509v3
@@ -21,6 +21,7 @@
, ExtSubjectAltName(..)
, ExtAuthorityKeyId(..)
, ExtCrlDistributionPoints(..)
+, ExtNetscapeComment(..)
, AltName(..)
, DistributionPoint(..)
, ReasonFlag(..)
@@ -35,11 +36,15 @@
import qualified Data.ByteString.Char8 as BC
import Data.ASN1.Types
import Data.ASN1.Parse
+import Data.ASN1.Encoding
+import Data.ASN1.BinaryEncoding
import Data.ASN1.BitArray
+import Data.Proxy
import Data.List (find)
import Data.X509.ExtensionRaw
import Data.X509.DistinguishedName
import Control.Applicative
+import Control.Monad
-- | key usage flag that is found in the key usage extension field.
data ExtKeyUsageFlag =
@@ -65,10 +70,23 @@
--
-- each extension have a unique OID associated, and a way
-- to encode and decode an ASN1 stream.
+--
+-- Errata: turns out, the content is not necessarily ASN1,
+-- it could be data that is only parsable by the extension
+-- e.g. raw ascii string. Add method to parse and encode with
+-- ByteString
class Extension a where
-extOID:: a -> OID
-extEncode :: a -> [ASN1]
-extDecode :: [ASN1] -> Either String a
+extOID :: a -> OID
+extHasNestedASN1 :: Proxy a -> Bool
+extEncode:: a -> [ASN1]
+extDecode:: [ASN1] -> Either String a
+
+extDecodeBs :: B.ByteString -> Either String a
+extDecodeBs = (either (Left . show) Right . decodeASN1' BER) >=> extDecode
+
+extEncodeBs :: a -> B.ByteString
+extEncodeBs = encodeASN1' DER . extEncode
+
-- | Get a specific extension from a lists of raw extensions
extensionGet :: Extension a => Extensions -> Maybe a
@@ -94,16 +112,17 @@
-- * Nothing, the OID doesn't match
-- * Just Left, the OID matched, but the extension couldn't be decoded
-- * Just Right, the OID matched, and the extension has been succesfully
decoded
-extensionDecode :: Extension a => ExtensionRaw -> Maybe (Either String a)
-extensionDecode = doDecode undefined
- where doDecode :: Extension a => a -> ExtensionRaw -> Maybe (Either String a)
-doDecode dummy (ExtensionRaw oid _ asn1)
-| extOID dummy == oid = Just (extDecode asn1)
-| otherwise = Nothing
+extensionDecode :: forall a . Extension a => ExtensionRaw -> Maybe (Either
String a)
+extensionDecode er@(ExtensionRaw oid _ content)
+| extOID (undefined :: a) /= oid = Nothing
+| extHasNestedASN1 (Proxy :: Proxy a) = Just (tryExtRawASN1 er >>=
extDecode)
+| otherwise = Just (extDecodeBs content)
-- | Encode an Extension to extensionRaw
-extensionEncode :: Extension a => Bool -> a -> ExtensionRaw
-extensionEncode critic
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2016-10-19 13:04:47
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new (New)
Package is "ghc-x509"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2016-07-20
09:19:51.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2016-10-19
13:04:51.0 +0200
@@ -1,0 +2,5 @@
+Mon Sep 26 06:51:53 UTC 2016 - psim...@suse.com
+
+- Update to version 1.6.4 with cabal2obs.
+
+---
Old:
x509-1.6.3.tar.gz
New:
x509-1.6.4.tar.gz
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.hJVHAD/_old 2016-10-19 13:04:54.0 +0200
+++ /var/tmp/diff_new_pack.hJVHAD/_new 2016-10-19 13:04:54.0 +0200
@@ -19,15 +19,14 @@
%global pkg_name x509
%bcond_with tests
Name: ghc-%{pkg_name}
-Version:1.6.3
+Version:1.6.4
Release:0
Summary:X509 reader and writer
License:BSD-3-Clause
-Group: System/Libraries
+Group: Development/Languages/Other
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
-# Begin cabal-rpm deps:
BuildRequires: ghc-asn1-encoding-devel
BuildRequires: ghc-asn1-parse-devel
BuildRequires: ghc-asn1-types-devel
@@ -44,7 +43,6 @@
BuildRequires: ghc-tasty-devel
BuildRequires: ghc-tasty-quickcheck-devel
%endif
-# End cabal-rpm deps
%description
X509 reader and writer.
@@ -63,20 +61,14 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%check
-%if %{with tests}
-%{cabal} test
-%endif
-
+%cabal_test
%post devel
%ghc_pkg_recache
++ x509-1.6.3.tar.gz -> x509-1.6.4.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.6.3/Data/X509/PublicKey.hs
new/x509-1.6.4/Data/X509/PublicKey.hs
--- old/x509-1.6.3/Data/X509/PublicKey.hs 2015-09-21 22:50:46.0
+0200
+++ new/x509-1.6.4/Data/X509/PublicKey.hs 2016-09-15 22:15:59.0
+0200
@@ -132,7 +132,7 @@
}, xs2)
_ ->
Left $ "fromASN1: X509.PubKey: unknown EC format: " ++
show xs
-| otherwise = error ("unknown public key OID: " ++ show pkalg)
+| otherwise = Left $ "fromASN1: unknown public key OID: " ++ show pkalg
where decodeASN1Err format bits xs2 f =
case decodeASN1' BER (bitArrayGetData bits) of
Left err -> Left ("fromASN1: X509.PubKey " ++ format ++ "
bitarray cannot be parsed: " ++ show err)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.6.3/x509.cabal new/x509-1.6.4/x509.cabal
--- old/x509-1.6.3/x509.cabal 2015-09-21 22:50:46.0 +0200
+++ new/x509-1.6.4/x509.cabal 2016-09-15 22:53:01.0 +0200
@@ -1,5 +1,5 @@
Name:x509
-Version: 1.6.3
+Version: 1.6.4
Description: X509 reader and writer
License: BSD3
License-file:LICENSE
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2016-07-20 09:19:47
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new (New)
Package is "ghc-x509"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2015-10-06
13:24:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2016-07-20
09:19:51.0 +0200
@@ -1,0 +2,5 @@
+Sun Jul 10 17:06:00 UTC 2016 - psim...@suse.com
+
+- Update to version 1.6.3 revision 0 with cabal2obs.
+
+---
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.tGi8NN/_old 2016-07-20 09:19:53.0 +0200
+++ /var/tmp/diff_new_pack.tGi8NN/_new 2016-07-20 09:19:53.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-x509
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,16 @@
%global pkg_name x509
-
%bcond_with tests
-
-Name: ghc-x509
+Name: ghc-%{pkg_name}
Version:1.6.3
Release:0
Summary:X509 reader and writer
License:BSD-3-Clause
Group: System/Libraries
-
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-asn1-encoding-devel
BuildRequires: ghc-asn1-parse-devel
@@ -40,13 +34,12 @@
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-cryptonite-devel
-BuildRequires: ghc-directory-devel
-BuildRequires: ghc-filepath-devel
BuildRequires: ghc-hourglass-devel
BuildRequires: ghc-memory-devel
BuildRequires: ghc-mtl-devel
BuildRequires: ghc-pem-devel
-BuildRequires: ghc-process-devel
+BuildRequires: ghc-rpm-macros
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with tests}
BuildRequires: ghc-tasty-devel
BuildRequires: ghc-tasty-quickcheck-devel
@@ -56,33 +49,35 @@
%description
X509 reader and writer.
-
%package devel
Summary:Haskell %{pkg_name} library development files
Group: Development/Libraries/Other
+Requires: %{name} = %{version}-%{release}
Requires: ghc-compiler = %{ghc_version}
Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
-Requires: %{name} = %{version}-%{release}
%description devel
This package provides the Haskell %{pkg_name} library development files.
-
%prep
%setup -q -n %{pkg_name}-%{version}
+
%build
%ghc_lib_build
+
%install
%ghc_lib_install
+
%check
%if %{with tests}
-%cabal test
+%{cabal} test
%endif
+
%post devel
%ghc_pkg_recache
commit ghc-x509 for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-x509 for openSUSE:Factory checked in at 2015-10-06 13:24:28 Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old) and /work/SRC/openSUSE:Factory/.ghc-x509.new (New) Package is "ghc-x509" Changes: --- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2015-09-17 09:19:40.0 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2015-10-06 13:24:28.0 +0200 @@ -1,0 +2,5 @@ +Sun Sep 27 10:26:28 UTC 2015 - mimi...@gmail.com + +- update to 1.6.3 + +--- Old: x509-1.6.1.tar.gz New: x509-1.6.3.tar.gz Other differences: -- ++ ghc-x509.spec ++ --- /var/tmp/diff_new_pack.jzPis0/_old 2015-10-06 13:24:29.0 +0200 +++ /var/tmp/diff_new_pack.jzPis0/_new 2015-10-06 13:24:29.0 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-x509 -Version:1.6.1 +Version:1.6.3 Release:0 Summary:X509 reader and writer License:BSD-3-Clause ++ x509-1.6.1.tar.gz -> x509-1.6.3.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.6.1/Data/X509/AlgorithmIdentifier.hs new/x509-1.6.3/Data/X509/AlgorithmIdentifier.hs --- old/x509-1.6.1/Data/X509/AlgorithmIdentifier.hs 2015-09-07 16:58:09.0 +0200 +++ new/x509-1.6.3/Data/X509/AlgorithmIdentifier.hs 2015-09-21 22:50:46.0 +0200 @@ -29,7 +29,7 @@ data PubKeyALG = PubKeyALG_RSA -- ^ RSA Public Key algorithm | PubKeyALG_DSA -- ^ DSA Public Key algorithm -| PubKeyALG_ECDSA -- ^ ECDSA Public Key algorithm +| PubKeyALG_EC -- ^ ECDSA & ECDH Public Key algorithm | PubKeyALG_DH -- ^ Diffie Hellman Public Key algorithm | PubKeyALG_Unknown OID -- ^ Unknown Public Key algorithm deriving (Show,Eq) @@ -44,7 +44,7 @@ instance OIDable PubKeyALG where getObjectID PubKeyALG_RSA = [1,2,840,113549,1,1,1] getObjectID PubKeyALG_DSA = [1,2,840,10040,4,1] -getObjectID PubKeyALG_ECDSA = [1,2,840,10045,2,1] +getObjectID PubKeyALG_EC= [1,2,840,10045,2,1] getObjectID PubKeyALG_DH= [1,2,840,10046,2,1] getObjectID (PubKeyALG_Unknown oid) = oid @@ -58,10 +58,11 @@ , ([1,2,840,113549,1,1,13], SignatureALG HashSHA512 PubKeyALG_RSA) , ([1,2,840,113549,1,1,14], SignatureALG HashSHA224 PubKeyALG_RSA) , ([1,2,840,10040,4,3],SignatureALG HashSHA1 PubKeyALG_DSA) -, ([1,2,840,10045,4,3,1], SignatureALG HashSHA224 PubKeyALG_ECDSA) -, ([1,2,840,10045,4,3,2], SignatureALG HashSHA256 PubKeyALG_ECDSA) -, ([1,2,840,10045,4,3,3], SignatureALG HashSHA384 PubKeyALG_ECDSA) -, ([1,2,840,10045,4,3,4], SignatureALG HashSHA512 PubKeyALG_ECDSA) +, ([1,2,840,10045,4,1],SignatureALG HashSHA1 PubKeyALG_EC) +, ([1,2,840,10045,4,3,1], SignatureALG HashSHA224 PubKeyALG_EC) +, ([1,2,840,10045,4,3,2], SignatureALG HashSHA256 PubKeyALG_EC) +, ([1,2,840,10045,4,3,3], SignatureALG HashSHA384 PubKeyALG_EC) +, ([1,2,840,10045,4,3,4], SignatureALG HashSHA512 PubKeyALG_EC) ] oidSig :: OID -> SignatureALG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.6.1/Data/X509/CRL.hs new/x509-1.6.3/Data/X509/CRL.hs --- old/x509-1.6.1/Data/X509/CRL.hs 2015-09-07 16:58:09.0 +0200 +++ new/x509-1.6.3/Data/X509/CRL.hs 2015-09-21 22:50:46.0 +0200 @@ -66,10 +66,10 @@ <*> getRevokedCertificates <*> getObject where getVersion (IntVal v) = return $ fromIntegral v -getVersion _ = throwError "unexpected type for version" +getVersion _ = throwParseError "unexpected type for version" getThisUpdate (ASN1Time _ t1 _) = return t1 -getThisUpdate _ = throwError "bad this update format, expecting time" +getThisUpdate _ = throwParseError "bad this update format, expecting time" getNextUpdate = getNextMaybe timeOrNothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.6.1/Data/X509/Cert.hs new/x509-1.6.3/Data/X509/Cert.hs --- old/x509-1.6.1/Data/X509/Cert.hs2015-09-07 16:58:09.0 +0200 +++ new/x509-1.6.3/Data/X509/Cert.hs2015-09-21 22:50:46.0 +0200 @@ -55,19 +55,19 @@ parseCertHeaderVersion = maybe 1 id <$> onNextContainerMaybe (Container Context 0) (getNext >>= getVer) where getVer (IntVal v) = return $ fromIntegral v -getVer _ = throwError "unexpected t
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2015-09-17 09:19:39
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new (New)
Package is "ghc-x509"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2015-08-25
08:48:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2015-09-17
09:19:40.0 +0200
@@ -1,0 +2,5 @@
+Sun Sep 13 13:05:47 UTC 2015 - mimi...@gmail.com
+
+- update to 1.6.1
+
+---
Old:
x509-1.6.0.tar.gz
New:
x509-1.6.1.tar.gz
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.zBjLiA/_old 2015-09-17 09:19:41.0 +0200
+++ /var/tmp/diff_new_pack.zBjLiA/_new 2015-09-17 09:19:41.0 +0200
@@ -21,7 +21,7 @@
%bcond_with tests
Name: ghc-x509
-Version:1.6.0
+Version:1.6.1
Release:0
Summary:X509 reader and writer
License:BSD-3-Clause
++ x509-1.6.0.tar.gz -> x509-1.6.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.6.0/Data/X509/CRL.hs
new/x509-1.6.1/Data/X509/CRL.hs
--- old/x509-1.6.0/Data/X509/CRL.hs 2015-06-19 22:14:24.0 +0200
+++ new/x509-1.6.1/Data/X509/CRL.hs 2015-09-07 16:58:09.0 +0200
@@ -18,7 +18,7 @@
import Control.Applicative
-import Data.Hourglass (DateTime)
+import Data.Hourglass (DateTime, TimezoneOffset(..))
import Data.ASN1.Types
import Data.X509.DistinguishedName
@@ -54,7 +54,7 @@
Right (RevokedCertificate serial t (Extensions Nothing), xs)
fromASN1 l = Left ("fromASN1: X509.RevokedCertificate: unknown format:" ++
show l)
toASN1 (RevokedCertificate serial time _) = \xs ->
-Start Sequence : IntVal serial : ASN1Time TimeGeneralized time Nothing
: End Sequence : xs
+Start Sequence : IntVal serial : ASN1Time TimeGeneralized time (Just
(TimezoneOffset 0)) : End Sequence : xs
parseCRL :: ParseASN1 CRL
parseCRL = do
@@ -83,8 +83,8 @@
[IntVal $ crlVersion crl] ++
toASN1 (crlSignatureAlg crl) [] ++
toASN1 (crlIssuer crl) [] ++
-[ASN1Time TimeGeneralized (crlThisUpdate crl) Nothing] ++
-(maybe [] (\t -> [ASN1Time TimeGeneralized t Nothing]) (crlNextUpdate
crl)) ++
+[ASN1Time TimeGeneralized (crlThisUpdate crl) (Just (TimezoneOffset 0))] ++
+(maybe [] (\t -> [ASN1Time TimeGeneralized t (Just (TimezoneOffset 0))])
(crlNextUpdate crl)) ++
[Start Sequence] ++
revoked ++
[End Sequence] ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.6.0/Data/X509/Cert.hs
new/x509-1.6.1/Data/X509/Cert.hs
--- old/x509-1.6.0/Data/X509/Cert.hs2015-06-19 22:14:24.0 +0200
+++ new/x509-1.6.1/Data/X509/Cert.hs2015-09-07 16:58:09.0 +0200
@@ -12,13 +12,13 @@
module Data.X509.Cert (Certificate(..)) where
import Data.ASN1.Types
-import Data.Hourglass (DateTime, TimezoneOffset(TimezoneOffset))
import Control.Applicative ((<$>), (<*>))
import Data.X509.Internal
import Data.X509.PublicKey
import Data.X509.AlgorithmIdentifier
import Data.X509.DistinguishedName
import Data.X509.ExtensionRaw
+import Data.Hourglass
data CertKeyUsage =
CertKeyUsageDigitalSignature
@@ -104,8 +104,12 @@
eAlgId= toASN1 (certSignatureAlg cert) []
eIssuer = toASN1 (certIssuerDN cert) []
(t1, t2) = certValidity cert
-eValidity = asn1Container Sequence [ASN1Time TimeGeneralized t1 (Just
(TimezoneOffset 0))
- ,ASN1Time TimeGeneralized t2 (Just
(TimezoneOffset 0))]
+eValidity = asn1Container Sequence [ASN1Time (timeType t1) t1 (Just
(TimezoneOffset 0))
+ ,ASN1Time (timeType t2) t2 (Just
(TimezoneOffset 0))]
eSubject = toASN1 (certSubjectDN cert) []
epkinfo = toASN1 (certPubKey cert) []
eexts = toASN1 (certExtensions cert) []
+timeType t =
+if t >= timeConvert (Date 2050 January 1)
+then TimeGeneralized
+else TimeUTC
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.6.0/Data/X509/DistinguishedName.hs
new/x509-1.6.1/Data/X509/DistinguishedName.hs
--- old/x509-1.6.0/Data/X509/DistinguishedName.hs 2015-06-19
22:14:24.0 +0200
+++ new/x509-1.6.1/Data/X509/DistinguishedName.hs 2015-09-07
16:58:09.0 +0200
@@ -30,6 +30,7 @@
| DnCountry -- ^ Country
| DnOrganization -- ^ O
| Dn
commit ghc-x509 for openSUSE:Factory
Hello community, here is the log from the commit of package ghc-x509 for openSUSE:Factory checked in at 2015-08-25 07:19:23 Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old) and /work/SRC/openSUSE:Factory/.ghc-x509.new (New) Package is "ghc-x509" Changes: --- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2015-06-02 10:05:13.0 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2015-08-25 08:48:28.0 +0200 @@ -1,0 +2,5 @@ +Thu Aug 6 20:28:55 UTC 2015 - mimi...@gmail.com + +- update to 1.6.0 + +--- Old: x509-1.5.1.tar.gz New: x509-1.6.0.tar.gz Other differences: -- ++ ghc-x509.spec ++ --- /var/tmp/diff_new_pack.ySB1ma/_old 2015-08-25 08:48:29.0 +0200 +++ /var/tmp/diff_new_pack.ySB1ma/_new 2015-08-25 08:48:29.0 +0200 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-x509 -Version:1.5.1 +Version:1.6.0 Release:0 Summary:X509 reader and writer License:BSD-3-Clause @@ -39,11 +39,11 @@ BuildRequires: ghc-asn1-types-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-crypto-pubkey-types-devel -BuildRequires: ghc-cryptohash-devel +BuildRequires: ghc-cryptonite-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-hourglass-devel +BuildRequires: ghc-memory-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-pem-devel BuildRequires: ghc-process-devel ++ x509-1.5.1.tar.gz -> x509-1.6.0.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.5.1/Data/X509/Internal.hs new/x509-1.6.0/Data/X509/Internal.hs --- old/x509-1.5.1/Data/X509/Internal.hs2015-05-30 07:41:48.0 +0200 +++ new/x509-1.6.0/Data/X509/Internal.hs2015-06-19 22:14:24.0 +0200 @@ -26,6 +26,7 @@ type ErrT = ExceptT #else import Control.Monad.Error +runErrT :: ErrorT e m a -> m (Either e a) runErrT = runErrorT type ErrT = ErrorT #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.5.1/Data/X509/OID.hs new/x509-1.6.0/Data/X509/OID.hs --- old/x509-1.5.1/Data/X509/OID.hs 1970-01-01 01:00:00.0 +0100 +++ new/x509-1.6.0/Data/X509/OID.hs 2015-06-19 22:14:24.0 +0200 @@ -0,0 +1,63 @@ +-- | +-- Module : Data.X509.OID +-- License : BSD-style +-- Maintainer : Vincent Hanquez +-- Stability : experimental +-- Portability : unknown +-- +module Data.X509.OID +( OIDTable +, lookupByOID +, lookupOID +, curvesOIDTable +) where + +import Control.Applicative +import Crypto.PubKey.ECC.Types +import Data.ASN1.OID +import Data.List (find) + +type OIDTable a = [(a,OID)] + +lookupByOID :: OIDTable a -> OID -> Maybe a +lookupByOID table oid = fst <$> find ((==) oid . snd) table + +lookupOID :: Eq a => OIDTable a -> a -> Maybe OID +lookupOID table a = lookup a table + +curvesOIDTable :: OIDTable CurveName +curvesOIDTable = +[ (SEC_p112r1, [1,3,132,0,6]) +, (SEC_p112r2, [1,3,132,0,7]) +, (SEC_p128r1, [1,3,132,0,28]) +, (SEC_p128r2, [1,3,132,0,29]) +, (SEC_p160k1, [1,3,132,0,9]) +, (SEC_p160r1, [1,3,132,0,8]) +, (SEC_p160r2, [1,3,132,0,30]) +, (SEC_p192k1, [1,3,132,0,31]) +, (SEC_p192r1, [1,2,840,10045,3,1,1]) +, (SEC_p224k1, [1,3,132,0,32]) +, (SEC_p224r1, [1,3,132,0,33]) +, (SEC_p256k1, [1,3,132,0,10]) +, (SEC_p256r1, [1,2,840,10045,3,1,7]) +, (SEC_p384r1, [1,3,132,0,34]) +, (SEC_p521r1, [1,3,132,0,35]) +, (SEC_t113r1, [1,3,132,0,4]) +, (SEC_t113r2, [1,3,132,0,5]) +, (SEC_t131r1, [1,3,132,0,22]) +, (SEC_t131r2, [1,3,132,0,23]) +, (SEC_t163k1, [1,3,132,0,1]) +, (SEC_t163r1, [1,3,132,0,2]) +, (SEC_t163r2, [1,3,132,0,15]) +, (SEC_t193r1, [1,3,132,0,24]) +, (SEC_t193r2, [1,3,132,0,25]) +, (SEC_t233k1, [1,3,132,0,26]) +, (SEC_t233r1, [1,3,132,0,27]) +, (SEC_t239k1, [1,3,132,0,3]) +, (SEC_t283k1, [1,3,132,0,16]) +, (SEC_t283r1, [1,3,132,0,17]) +, (SEC_t409k1, [1,3,132,0,36]) +, (SEC_t409r1, [1,3,132,0,37]) +, (SEC_t571k1, [1,3,132,0,38]) +, (SEC_t571r1, [1,3,132,0,39]) +] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/x509-1.5.1/Data/X509/PrivateKey.hs new/x509-1.6.0/Data/X509/PrivateKey.hs --- old/x509-1.5.1/Data/X509/PrivateKey.hs 2015-05-30 07:41:48.0 +0200 +++ new/x509-1.6.0/Data/X509/PrivateKey.hs 2015-06-19 22:14:24.0 +0200 @@ -13,8 +13,8 @@ ) where import Data.X509.AlgorithmIdentifier -import
commit ghc-x509 for openSUSE:Factory
Hello community,
here is the log from the commit of package ghc-x509 for openSUSE:Factory
checked in at 2015-06-02 10:05:12
Comparing /work/SRC/openSUSE:Factory/ghc-x509 (Old)
and /work/SRC/openSUSE:Factory/.ghc-x509.new (New)
Package is "ghc-x509"
Changes:
--- /work/SRC/openSUSE:Factory/ghc-x509/ghc-x509.changes2015-05-21
08:38:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-x509.new/ghc-x509.changes 2015-06-02
10:05:13.0 +0200
@@ -1,0 +2,5 @@
+Sun May 31 19:47:07 UTC 2015 - mimi...@gmail.com
+
+- update to 1.5.1
+
+---
Old:
x509-1.5.0.1.tar.gz
New:
x509-1.5.1.tar.gz
Other differences:
--
++ ghc-x509.spec ++
--- /var/tmp/diff_new_pack.hjizCF/_old 2015-06-02 10:05:14.0 +0200
+++ /var/tmp/diff_new_pack.hjizCF/_new 2015-06-02 10:05:14.0 +0200
@@ -15,17 +15,18 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%global pkg_name x509
%bcond_with tests
Name: ghc-x509
-Version:1.5.0.1
+Version:1.5.1
Release:0
Summary:X509 reader and writer
+License:BSD-3-Clause
Group: System/Libraries
-License:BSD-3-Clause
Url:https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -71,36 +72,28 @@
%prep
%setup -q -n %{pkg_name}-%{version}
-
%build
%ghc_lib_build
-
%install
%ghc_lib_install
-
%check
%if %{with tests}
%cabal test
%endif
-
%post devel
%ghc_pkg_recache
-
%postun devel
%ghc_pkg_recache
-
%files -f %{name}.files
%defattr(-,root,root,-)
%doc LICENSE
-
%files devel -f %{name}-devel.files
%defattr(-,root,root,-)
-
%changelog
++ x509-1.5.0.1.tar.gz -> x509-1.5.1.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.5.0.1/Data/X509/AlgorithmIdentifier.hs
new/x509-1.5.1/Data/X509/AlgorithmIdentifier.hs
--- old/x509-1.5.0.1/Data/X509/AlgorithmIdentifier.hs 2014-10-20
06:09:06.0 +0200
+++ new/x509-1.5.1/Data/X509/AlgorithmIdentifier.hs 2015-05-30
07:41:48.0 +0200
@@ -55,6 +55,8 @@
, ([1,2,840,113549,1,1,2], SignatureALG HashMD2 PubKeyALG_RSA)
, ([1,2,840,113549,1,1,11], SignatureALG HashSHA256 PubKeyALG_RSA)
, ([1,2,840,113549,1,1,12], SignatureALG HashSHA384 PubKeyALG_RSA)
+, ([1,2,840,113549,1,1,13], SignatureALG HashSHA512 PubKeyALG_RSA)
+, ([1,2,840,113549,1,1,14], SignatureALG HashSHA224 PubKeyALG_RSA)
, ([1,2,840,10040,4,3],SignatureALG HashSHA1 PubKeyALG_DSA)
, ([1,2,840,10045,4,3,1], SignatureALG HashSHA224 PubKeyALG_ECDSA)
, ([1,2,840,10045,4,3,2], SignatureALG HashSHA256 PubKeyALG_ECDSA)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/x509-1.5.0.1/Data/X509/Cert.hs
new/x509-1.5.1/Data/X509/Cert.hs
--- old/x509-1.5.0.1/Data/X509/Cert.hs 2014-10-20 06:09:06.0 +0200
+++ new/x509-1.5.1/Data/X509/Cert.hs2015-05-30 07:41:48.0 +0200
@@ -12,7 +12,7 @@
module Data.X509.Cert (Certificate(..)) where
import Data.ASN1.Types
-import Data.Hourglass (DateTime)
+import Data.Hourglass (DateTime, TimezoneOffset(TimezoneOffset))
import Control.Applicative ((<$>), (<*>))
import Data.X509.Internal
import Data.X509.PublicKey
@@ -41,7 +41,7 @@
, certSerial :: Integer-- ^ Serial number
, certSignatureAlg :: SignatureALG -- ^ Signature algorithm
, certIssuerDN :: DistinguishedName -- ^ Issuer DN
-, certValidity :: (DateTime, DateTime) -- ^ Validity period
+, certValidity :: (DateTime, DateTime) -- ^ Validity period (UTC)
, certSubjectDN:: DistinguishedName -- ^ Subject DN
, certPubKey :: PubKey -- ^ Public key
, certExtensions :: Extensions -- ^ Extensions
@@ -104,8 +104,8 @@
eAlgId= toASN1 (certSignatureAlg cert) []
eIssuer = toASN1 (certIssuerDN cert) []
(t1, t2) = certValidity cert
-eValidity = asn1Container Sequence [ASN1Time TimeGeneralized t1 Nothing
- ,ASN1Time TimeGeneralized t2
Nothing]
+eValidity = asn1Container Sequence [ASN1Time TimeGeneralized t1 (Just
(TimezoneOffset 0))
+ ,ASN1Time TimeGeneralized t2 (Just
(TimezoneOffset 0))]
eSubject = toASN1 (certSubjectDN cert) []
epkinfo = toAS
