From e064369424431bdaa6d839022a736366fff6eb38 Mon Sep 17 00:00:00 2001
From: Jack Crawford <54402133+jlhcrawford@users.noreply.github.com>
Date: Thu, 4 Mar 2021 13:46:35 +0000
Subject: [PATCH] HElib v2.1.0 release update
* Update to CHANGES.md to reflect changes for HElib v2.1.0 release
* Updated version number to 2.1.0
---
.travis.yml | 2 +-
CHANGES.md | 11 +++++++++
VERSION | 2 +-
ci/install_deps.sh | 2 +-
.../BGV_packed_arithmetic.cpp | 2 +-
include/helib/Ctxt.h | 2 +-
include/helib/EncryptedArray.h | 2 +-
include/helib/FHE.h | 2 +-
include/helib/Ptxt.h | 2 +-
include/helib/keys.h | 2 +-
misc/psi/README.md | 24 +++++++++----------
src/Ctxt.cpp | 2 +-
src/EaCx.cpp | 2 +-
tests/TestCKKS.cpp | 2 +-
tests/TestCtxt.cpp | 2 +-
tests/TestPtxt.cpp | 2 +-
16 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8aba61a24..eb54bcc9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 IBM Corp.
+# Copyright (C) 2020-2021 IBM Corp.
# This program is Licensed under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
diff --git a/CHANGES.md b/CHANGES.md
index c4240e5c5..81d276c62 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,17 @@
Release Changes
===============
+HElib 2.1.0, March 2021
+=========================
+(tagged as v2.1.0)
+
+* Deprecated APIs
+ * Documentation update: deprecated list
+ * Marked functions as deprecated
+ * Updated examples
+* Documentation update: PtxtArray JSON IO
+* Bug fixes
+
HElib 2.0.0, January 2021
=========================
(tagged as v2.0.0)
diff --git a/VERSION b/VERSION
index 227cea215..7ec1d6db4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0.0
+2.1.0
diff --git a/ci/install_deps.sh b/ci/install_deps.sh
index 6c9e073d7..bfe44bbbb 100755
--- a/ci/install_deps.sh
+++ b/ci/install_deps.sh
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (C) 2020 IBM Corp.
+# Copyright (C) 2020-2021 IBM Corp.
# This program is Licensed under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
diff --git a/examples/BGV_packed_arithmetic/BGV_packed_arithmetic.cpp b/examples/BGV_packed_arithmetic/BGV_packed_arithmetic.cpp
index b7772b41f..19d992f89 100644
--- a/examples/BGV_packed_arithmetic/BGV_packed_arithmetic.cpp
+++ b/examples/BGV_packed_arithmetic/BGV_packed_arithmetic.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2020 IBM Corp.
+/* Copyright (C) 2019-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
diff --git a/include/helib/Ctxt.h b/include/helib/Ctxt.h
index 97e07d9cc..5e92de509 100644
--- a/include/helib/Ctxt.h
+++ b/include/helib/Ctxt.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 IBM Corp.
+/* Copyright (C) 2012-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
diff --git a/include/helib/EncryptedArray.h b/include/helib/EncryptedArray.h
index eebd4915c..9359feb19 100644
--- a/include/helib/EncryptedArray.h
+++ b/include/helib/EncryptedArray.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 IBM Corp.
+/* Copyright (C) 2012-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
diff --git a/include/helib/FHE.h b/include/helib/FHE.h
index 715939559..94325ec09 100644
--- a/include/helib/FHE.h
+++ b/include/helib/FHE.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2019 IBM Corp.
+/* Copyright (C) 2012-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
diff --git a/include/helib/Ptxt.h b/include/helib/Ptxt.h
index 97f49cc3c..28dfc48e1 100644
--- a/include/helib/Ptxt.h
+++ b/include/helib/Ptxt.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2020 IBM Corp.
+/* Copyright (C) 2019-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
diff --git a/include/helib/keys.h b/include/helib/keys.h
index 8e8a59f84..8da5fc394 100644
--- a/include/helib/keys.h
+++ b/include/helib/keys.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 IBM Corp.
+/* Copyright (C) 2012-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
diff --git a/misc/psi/README.md b/misc/psi/README.md
index 0220401c7..b7b769dc4 100644
--- a/misc/psi/README.md
+++ b/misc/psi/README.md
@@ -31,22 +31,22 @@ columns, where the data can be seen in bold
2 4
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[0,1],[2,3],[4,5]]},"serializationVersion":"0.0.1","type":"Ptxt"}
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[0],[0],[0]]},"serializationVersion":"0.0.1","type":"Ptxt"}
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[6,7],[8,9],[10,11]]},"serializationVersion":"0.0.1","type":"Ptxt"}
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[1],[1],[1]]},"serializationVersion":"0.0.1","type":"Ptxt"}
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[12,13],[14,15],[16,17]]},"serializationVersion":"0.0.1","type":"Ptxt"}
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[2],[2],[2]]},"serializationVersion":"0.0.1","type":"Ptxt"}
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[18,19],[0],[0]]},"serializationVersion":"0.0.1","type":"Ptxt"}
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[3],[3],[3]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[0,1],[2,3],[4,5]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[0],[0],[0]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[6,7],[8,9],[10,11]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[1],[1],[1]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[12,13],[14,15],[16,17]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[2],[2],[2]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[18,19],[0],[0]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[3],[3],[3]]},"serializationVersion":"0.0.1","type":"Ptxt"}
and an example query
1 4
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[0,1],[2,3],[4,5]]},"serializationVersion":"0.0.1","type":"Ptxt"}
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[6,7],[8,9],[10,11]]},"serializationVersion":"0.0.1","type":"Ptxt"}
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[12,13],[14,15],[16,17]]},"serializationVersion":"0.0.1","type":"Ptxt"}
-{"HElibVersion":"2.0.0","content":{"scheme":"BGV","slots":[[18,19],[0],[0]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[0,1],[2,3],[4,5]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[6,7],[8,9],[10,11]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[12,13],[14,15],[16,17]]},"serializationVersion":"0.0.1","type":"Ptxt"}
+{"HElibVersion":"2.1.0","content":{"scheme":"BGV","slots":[[18,19],[0],[0]]},"serializationVersion":"0.0.1","type":"Ptxt"}
Make sure you are in the directory `/HElib/misc/psi/test`
diff --git a/src/Ctxt.cpp b/src/Ctxt.cpp
index fbe88cc72..509076330 100644
--- a/src/Ctxt.cpp
+++ b/src/Ctxt.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 IBM Corp.
+/* Copyright (C) 2012-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
diff --git a/src/EaCx.cpp b/src/EaCx.cpp
index 7ead80d50..0637ec0d4 100644
--- a/src/EaCx.cpp
+++ b/src/EaCx.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2012-2020 IBM Corp.
+/* Copyright (C) 2012-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
diff --git a/tests/TestCKKS.cpp b/tests/TestCKKS.cpp
index 79a7faa49..d5af025e7 100644
--- a/tests/TestCKKS.cpp
+++ b/tests/TestCKKS.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2020 IBM Corp.
+/* Copyright (C) 2019-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
diff --git a/tests/TestCtxt.cpp b/tests/TestCtxt.cpp
index 9b9fd5f16..79fccc399 100644
--- a/tests/TestCtxt.cpp
+++ b/tests/TestCtxt.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 IBM Corp.
+/* Copyright (C) 2020-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
diff --git a/tests/TestPtxt.cpp b/tests/TestPtxt.cpp
index aee82d508..06a09bc29 100644
--- a/tests/TestPtxt.cpp
+++ b/tests/TestPtxt.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2019-2020 IBM Corp.
+/* Copyright (C) 2019-2021 IBM Corp.
* This program is Licensed under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at