Merge d0b6eeb into 736041a

stefanberger · Jul 8, 2020 · 9154aec · 9154aec
2 parents 736041a + d0b6eeb
commit 9154aec
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,21 @@
+CHANGES - changes for swtpm
+
+version 0.2.1:
+  - swtpm:
+    - Only accept() new client ctrl connection if we have none
+    - Add --print-capabilities to help screen of 'swtpm chardev'
+    - Use writev_full rather than writev; fixes --vtpm-proxy EIO error
+  - swtpm_setup:
+    - bugfix: Create ECC storage primary key in owner hierarchy
+    - bugfix: remove tpm2_stirrandom and tpm2_changeeps
+    - Log about encryption and fix c&p error in err msg
+  - swtpm_cert:
+    - Use gnutls_x509_crt_get_subject_key_id API call for subj keyId
+    - Fix OIDs for TPM 2 platforms data
+  - tests:
+    - Adjusted pcrUpdateCounter in tests to succeed with PCR TCB group fixes
+      in libtpms TPM 2 code
+
 version 0.2.0:
   - Linux: swtpm now runs with a seccomp profile (blacklist) if compiled with
            libseccomp support

diff --git a/debian/changelog b/debian/changelog
@@ -1,12 +1,22 @@
+swtpm (0.2.1-1) RELEASED; urgency=medium
+
+  * Release of swtpm-0.2.1
+
+ -- Stefan Berger <stefanb@linux.ibm.com>  Fri, 10 Jul 2020 12:01:00 -0500
+
 swtpm (0.2.0-1) RELEASED; urgency=medium
 
+  * Release of swtpm-0.2.0
+
  -- Stefan Berger <stefanb@linux.ibm.com>  Tue, 16 Jul 2019 14:21:18 -0500
 
 swtpm (0.2.0~dev1) UNRELEASED; urgency=medium
 
+  * Developer release 1
+
  -- Stefan Berger <stefanb@linux.ibm.com>  Mon, 04 Feb 2019 14:30:08 -0500
 
-swtpm (0.1.0-1) RELEASED; urgency medium
+swtpm (0.1.0-1) RELEASED; urgency=medium
 
   * Initial public release
 

diff --git a/dist/swtpm.spec b/dist/swtpm.spec
@@ -1,7 +1,7 @@
 %bcond_without gnutls
 
-%global gitdate     20190719
-%global gitcommit   817d3a8863423f189d44d784b51b6d87f099ee7d
+%global gitdate     20200710
+%global gitcommit   git_commit
 %global gitshortcommit  %(c=%{gitcommit}; echo ${c:0:7})
 
 # Macros needed by SELinux
@@ -164,6 +164,9 @@ fi
 %attr( 755, tss, tss) %{_localstatedir}/lib/swtpm-localca
 
 %changelog
+* Fri Jul 10 2020 Stefan Berger <stefanb@linux.ibm.com> - 0.2.1
+- v0.2.1 release
+
 * Fri Jul 19 2019 Stefan Berger <stefanb@linux.ibm.com> - 0.2.0-20190716git817d3a8
 - v0.2.0 release
 

diff --git a/dist/swtpm.spec.in b/dist/swtpm.spec.in
@@ -1,7 +1,7 @@
 %bcond_without gnutls
 
-%global gitdate     20190719
-%global gitcommit   817d3a8863423f189d44d784b51b6d87f099ee7d
+%global gitdate     20200710
+%global gitcommit   git_commit
 %global gitshortcommit  %(c=%{gitcommit}; echo ${c:0:7})
 
 # Macros needed by SELinux
@@ -164,6 +164,9 @@ fi
 %attr( 755, @TSS_USER@, @TSS_GROUP@) %{_localstatedir}/lib/swtpm-localca
 
 %changelog
+* Fri Jul 10 2020 Stefan Berger <stefanb@linux.ibm.com> - 0.2.1
+- v0.2.1 release
+
 * Fri Jul 19 2019 Stefan Berger <stefanb@linux.ibm.com> - 0.2.0-20190716git817d3a8
 - v0.2.0 release