From 98c4775c0fb8df34b42fdc6018c31f06f7e754999550d4c1f196ccdee18668ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Mar 2024 22:01:03 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-tls revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tls?expand=0&rev=90 --- ghc-tls.changes | 6 ++++++ ghc-tls.spec | 2 +- tls.cabal | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ghc-tls.changes b/ghc-tls.changes index 7f9ce3d..e112ee9 100644 --- a/ghc-tls.changes +++ b/ghc-tls.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 26 05:57:23 UTC 2024 - Peter Simons + +- Update tls to version 2.0.1 revision 2. + Upstream has revised the Cabal build instructions on Hackage. + ------------------------------------------------------------------- Fri Mar 1 03:31:34 UTC 2024 - Peter Simons diff --git a/ghc-tls.spec b/ghc-tls.spec index d7aebda..9cfc805 100644 --- a/ghc-tls.spec +++ b/ghc-tls.spec @@ -26,7 +26,7 @@ Summary: TLS protocol native implementation 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 -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-asn1-encoding-devel BuildRequires: ghc-asn1-encoding-prof diff --git a/tls.cabal b/tls.cabal index 4626838..b5eab4e 100644 --- a/tls.cabal +++ b/tls.cabal @@ -1,7 +1,7 @@ cabal-version: >=1.10 name: tls version: 2.0.1 -x-revision: 1 +x-revision: 2 license: BSD3 license-file: LICENSE copyright: Vincent Hanquez @@ -126,7 +126,7 @@ library data-default-class >= 0.1 && < 0.2, memory >= 0.18 && < 0.19, mtl >= 2.2 && < 2.4, - network >= 3.1 && < 3.2, + network >= 3.1, serialise >= 0.2 && < 0.3, transformers >= 0.5 && < 0.7, unix-time >= 0.4.11 && < 0.5 From 6618a19900ac39d3a1a4f5b228bdd1af9c194f0379ccccad88a153f2aa4d99e7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 Mar 2024 22:00:48 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-9.8.x package:ghc-tls revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-tls?expand=0&rev=91 --- ghc-tls.changes | 9 ++ ghc-tls.spec | 4 +- tls-2.0.1.tar.gz | 3 - tls-2.0.2.tar.gz | 3 + tls.cabal | 221 ----------------------------------------------- 5 files changed, 13 insertions(+), 227 deletions(-) delete mode 100644 tls-2.0.1.tar.gz create mode 100644 tls-2.0.2.tar.gz delete mode 100644 tls.cabal diff --git a/ghc-tls.changes b/ghc-tls.changes index e112ee9..155f4df 100644 --- a/ghc-tls.changes +++ b/ghc-tls.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Mar 28 04:03:13 UTC 2024 - Peter Simons + +- Update tls to version 2.0.2. + ## Version 2.0.2 + + * Client checks sessionMaxEarlyDataSize to decide 0-RTT + * Client checks the resumption cipher properly. + ------------------------------------------------------------------- Tue Mar 26 05:57:23 UTC 2024 - Peter Simons diff --git a/ghc-tls.spec b/ghc-tls.spec index 9cfc805..be15237 100644 --- a/ghc-tls.spec +++ b/ghc-tls.spec @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.0.1 +Version: 2.0.2 Release: 0 Summary: TLS protocol native implementation 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 -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/2.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-asn1-encoding-devel BuildRequires: ghc-asn1-encoding-prof @@ -106,7 +105,6 @@ This package provides the Haskell %{pkg_name} profiling library. %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/tls-2.0.1.tar.gz b/tls-2.0.1.tar.gz deleted file mode 100644 index 786d1f3..0000000 --- a/tls-2.0.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98658cb0394a9cd08c56c5fe11a6c96f16c892a2a594db421cd72e0e7f7be684 -size 162814 diff --git a/tls-2.0.2.tar.gz b/tls-2.0.2.tar.gz new file mode 100644 index 0000000..648dc52 --- /dev/null +++ b/tls-2.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f9cce86ebdb9466772cce9c59151b1978437d552971046506940f38cc2515a1 +size 162902 diff --git a/tls.cabal b/tls.cabal deleted file mode 100644 index b5eab4e..0000000 --- a/tls.cabal +++ /dev/null @@ -1,221 +0,0 @@ -cabal-version: >=1.10 -name: tls -version: 2.0.1 -x-revision: 2 -license: BSD3 -license-file: LICENSE -copyright: Vincent Hanquez -maintainer: Kazu Yamamoto -author: Vincent Hanquez -homepage: https://github.com/haskell-tls/hs-tls -synopsis: TLS protocol native implementation -description: - Native Haskell TLS 1.2/1.3 protocol implementation for servers and clients. - -category: Network -build-type: Simple -extra-source-files: - test/*.hs - CHANGELOG.md - -source-repository head - type: git - location: https://github.com/haskell-tls/hs-tls - subdir: core - -flag devel - description: Development commands - default: False - -library - exposed-modules: - Network.TLS - Network.TLS.Cipher - Network.TLS.Compression - Network.TLS.Internal - Network.TLS.Extra - Network.TLS.Extra.Cipher - Network.TLS.Extra.FFDHE - Network.TLS.QUIC - - other-modules: - Network.TLS.Struct - Network.TLS.Struct13 - Network.TLS.Core - Network.TLS.Context - Network.TLS.Context.Internal - Network.TLS.Credentials - Network.TLS.Backend - Network.TLS.Crypto - Network.TLS.Crypto.DH - Network.TLS.Crypto.IES - Network.TLS.Crypto.Types - Network.TLS.ErrT - Network.TLS.Extension - Network.TLS.Handshake - Network.TLS.Handshake.Certificate - Network.TLS.Handshake.Client - Network.TLS.Handshake.Client.ClientHello - Network.TLS.Handshake.Client.Common - Network.TLS.Handshake.Client.ServerHello - Network.TLS.Handshake.Client.TLS12 - Network.TLS.Handshake.Client.TLS13 - Network.TLS.Handshake.Common - Network.TLS.Handshake.Common13 - Network.TLS.Handshake.Control - Network.TLS.Handshake.Key - Network.TLS.Handshake.Process - Network.TLS.Handshake.Random - Network.TLS.Handshake.Server - Network.TLS.Handshake.Server.ClientHello - Network.TLS.Handshake.Server.ClientHello12 - Network.TLS.Handshake.Server.ClientHello13 - Network.TLS.Handshake.Server.Common - Network.TLS.Handshake.Server.ServerHello12 - Network.TLS.Handshake.Server.ServerHello13 - Network.TLS.Handshake.Server.TLS12 - Network.TLS.Handshake.Server.TLS13 - Network.TLS.Handshake.Signature - Network.TLS.Handshake.State - Network.TLS.Handshake.State13 - Network.TLS.Hooks - Network.TLS.IO - Network.TLS.Imports - Network.TLS.KeySchedule - Network.TLS.MAC - Network.TLS.Measurement - Network.TLS.Packet - Network.TLS.Packet13 - Network.TLS.Parameters - Network.TLS.PostHandshake - Network.TLS.Record - Network.TLS.Record.Disengage - Network.TLS.Record.Engage - Network.TLS.Record.Layer - Network.TLS.Record.Reading - Network.TLS.Record.Writing - Network.TLS.Record.State - Network.TLS.Record.Types - Network.TLS.RNG - Network.TLS.State - Network.TLS.Session - Network.TLS.Sending - Network.TLS.Receiving - Network.TLS.Util - Network.TLS.Util.ASN1 - Network.TLS.Util.Serialization - Network.TLS.Types - Network.TLS.Wire - Network.TLS.X509 - - default-extensions: Strict StrictData - default-language: Haskell2010 - ghc-options: -Wall - build-depends: - base >=4.9 && <5, - asn1-encoding >= 0.9 && < 0.10, - asn1-types >= 0.3 && < 0.4, - async >= 2.2 && < 2.3, - base16-bytestring, - bytestring >= 0.10 && < 0.13, - cereal >= 0.5.3 && < 0.6, - crypton >= 0.34 && < 0.35, - crypton-x509 >= 1.7 && < 1.8, - crypton-x509-store >= 1.6 && < 1.7, - crypton-x509-validation >= 1.6.5 && < 1.7, - data-default-class >= 0.1 && < 0.2, - memory >= 0.18 && < 0.19, - mtl >= 2.2 && < 2.4, - network >= 3.1, - serialise >= 0.2 && < 0.3, - transformers >= 0.5 && < 0.7, - unix-time >= 0.4.11 && < 0.5 - -test-suite spec - type: exitcode-stdio-1.0 - main-is: Spec.hs - build-tool-depends: hspec-discover:hspec-discover - hs-source-dirs: test - other-modules: - API - Arbitrary - Certificate - CiphersSpec - EncodeSpec - HandshakeSpec - PipeChan - PubKey - Run - Session - ThreadSpec - - default-extensions: Strict StrictData - default-language: Haskell2010 - ghc-options: -Wall -threaded -rtsopts - build-depends: - base >=4.9 && <5, - QuickCheck, - asn1-types, - async, - bytestring, - crypton, - crypton-x509, - crypton-x509-validation, - data-default-class, - hourglass, - hspec, - serialise, - tls - -executable server - main-is: server.hs - hs-source-dirs: util - other-modules: - Common - HexDump - Imports - - default-language: Haskell2010 - default-extensions: Strict StrictData - ghc-options: -Wall -threaded -rtsopts - build-depends: - base >=4.9 && <5, - bytestring, - containers, - crypton, - crypton-x509-store, - crypton-x509-system, - data-default-class, - network, - tls - - if flag(devel) - - else - buildable: False - -executable client - main-is: client.hs - hs-source-dirs: util - other-modules: - Common - HexDump - Imports - - default-language: Haskell2010 - default-extensions: Strict StrictData - ghc-options: -Wall -threaded -rtsopts - build-depends: - base >=4.9 && <5, - bytestring, - crypton, - crypton-x509-store, - crypton-x509-system, - data-default-class, - network, - tls - - if flag(devel) - - else - buildable: False