From 597207f70608b7302628913fd55c84d839b40aef Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Thu, 6 Jul 2023 08:24:46 -0400 Subject: [PATCH 1/4] README: Reference version 3 of Cryptol Fixes #1542. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 777b839b0..2c08bfe34 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/GaloisInc/cryptol) -# Cryptol, version 2 +# Cryptol, version 3 This version of Cryptol is (C) 2013-2020 Galois, Inc., and distributed under a standard, three-clause BSD license. Please see @@ -19,7 +19,7 @@ Unlike current specification mechanisms, Cryptol is fully executable, allowing designers to experiment with their programs incrementally as their designs evolve. -This release is an interpreter for version 2 of the Cryptol +This release is an interpreter for version 3 of the Cryptol language. The interpreter includes a `:check` command, which tests predicates written in Cryptol against randomly-generated test vectors (in the style of From adb73d2a82f092c3a4f759555349f03620600564 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Thu, 6 Jul 2023 08:25:54 -0400 Subject: [PATCH 2/4] Update some copyright years to 2023 --- LICENSE | 2 +- LICENSE.rtf | 2 +- README.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index c879d8282..b55de2e8d 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013-2020 Galois Inc. +Copyright (c) 2013-2023 Galois Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/LICENSE.rtf b/LICENSE.rtf index 11fc67210..0017c9aa0 100644 --- a/LICENSE.rtf +++ b/LICENSE.rtf @@ -4,7 +4,7 @@ \margl1440\margr1440\vieww12600\viewh7800\viewkind0 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural -\f0\fs24 \cf0 Copyright (c) 2013-2020 Galois Inc.\ +\f0\fs24 \cf0 Copyright (c) 2013-2023 Galois Inc.\ All rights reserved.\ \ Redistribution and use in source and binary forms, with or without\ diff --git a/README.md b/README.md index 2c08bfe34..e2fddb3b2 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Cryptol, version 3 - This version of Cryptol is (C) 2013-2020 Galois, Inc., and + This version of Cryptol is (C) 2013-2023 Galois, Inc., and distributed under a standard, three-clause BSD license. Please see the file LICENSE, distributed with this software, for specific terms and conditions. From 593f6b002cd9cb00eccd0552c4b038590e4763cc Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Thu, 6 Jul 2023 08:29:36 -0400 Subject: [PATCH 3/4] README: Acknowledge some additional Cryptol contributors Mention Bretton Chen, Henry Blanchette, and Matthew Yacavone, all of whom have made significant contributions. Also use Hazel Weakly's current name. --- README.md | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index e2fddb3b2..20ddd5709 100644 --- a/README.md +++ b/README.md @@ -205,20 +205,20 @@ and by cryptographers to ## Acknowledgements Cryptol has been under development for over a decade with many people -contributing to its design and implementation. Those people include (but -are not limited to) Aaron Tomb, Adam Foltzer, Adam Wick, Alexander -Bakst, Andrew Kent, Andrei Stefanescu, Andrey Chudnov, Andy Gill, -Benjamin Barenblat, Ben Jones, Ben Selfridge, Brett Boston, Brian -Huffman, Brian Ledger, Chris Phifer, Daniel Wagner, David Thrane -Christiansen, David Lazar, Dylan McNamee, Eddy Westbrook, Edward Yang, -Eric Mertens, Eric Mullen, Fergus Henderson, Iavor Diatchki, Jared -Weakly, Jeff Lewis, Jim Teisher, Joe Hendrix, Joe Hurd, Joe Kiniry, Joel -Stanley, Joey Dodds, John Launchbury, John Matthews, Jonathan Daugherty, -Kenneth Foner, Kevin Quick, Kyle Carter, Ledah Casburn, Lee Pike, Levent -Erkök, Lisanna Dettwyler, Magnus Carlsson, Mark Shields, Mark Tullsen, -Matt Sottile, Nathan Collins, Philip Weaver, Robert Dockins, Ryan Scott, -Sally Browning, Sam Anklesaria, Sigbjørn Finne, Stephen Magill, Thomas -Nordin, Trevor Elliott, and Tristan Ravitch. +contributing to its design and implementation. Those people include (but are +not limited to) Aaron Tomb, Adam Foltzer, Adam Wick, Alexander Bakst, Andrew +Kent, Andrei Stefanescu, Andrey Chudnov, Andy Gill, Benjamin Barenblat, Ben +Jones, Ben Selfridge, Brett Boston, Bretton Chen, Brian Huffman, Brian Ledger, +Chris Phifer, Daniel Wagner, David Thrane Christiansen, David Lazar, Dylan +McNamee, Eddy Westbrook, Edward Yang, Eric Mertens, Eric Mullen, Fergus +Henderson, Hazel Weakly, Henry Blanchette, Iavor Diatchki, Jeff Lewis, Jim +Teisher, Joe Hendrix, Joe Hurd, Joe Kiniry, Joel Stanley, Joey Dodds, John +Launchbury, John Matthews, Jonathan Daugherty, Kenneth Foner, Kevin Quick, Kyle +Carter, Ledah Casburn, Lee Pike, Levent Erkök, Lisanna Dettwyler, Magnus +Carlsson, Mark Shields, Mark Tullsen, Matt Sottile, Matthew Yacavone, Nathan +Collins, Philip Weaver, Robert Dockins, Ryan Scott, Sally Browning, Sam +Anklesaria, Sigbjørn Finne, Stephen Magill, Thomas Nordin, Trevor Elliott, and +Tristan Ravitch. Much of the work on Cryptol has been funded by, and lots of design input was provided by, the team at the [NSA's Laboratory for Advanced Cybersecurity From dd0151540e890a7dab1ebe4dc6f73e8e30699644 Mon Sep 17 00:00:00 2001 From: Ryan Scott Date: Thu, 6 Jul 2023 14:54:55 -0400 Subject: [PATCH 4/4] cryptol-remote-api: Don't hardcode version number in project description It's easy to forget to update this. In addition, the version number is specified elsewhere in the pyproject.toml file, so putting the version number in the description in redundant. --- cryptol-remote-api/python/pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cryptol-remote-api/python/pyproject.toml b/cryptol-remote-api/python/pyproject.toml index a9505521f..ce8c4046b 100644 --- a/cryptol-remote-api/python/pyproject.toml +++ b/cryptol-remote-api/python/pyproject.toml @@ -3,7 +3,7 @@ name = "cryptol" version = "3.0.0.99" readme = "README.md" keywords = ["cryptography", "verification"] -description = "Cryptol client for the Cryptol 2.13 RPC server" +description = "Cryptol client for the Cryptol RPC server" authors = ["Galois, Inc. "] license = "BSD License"