From 3782c872f4b8ec3633f8113149c387cb39c8f972 Mon Sep 17 00:00:00 2001
From: Paul Yang <kaishen.yy@antfin.com>
Date: Fri, 25 Feb 2022 10:54:20 +0800
Subject: [PATCH] BabaSSL 8.3.0 release

---
 CHANGES.BabaSSL            | 30 ++++++++++++++++++++++++++++--
 include/openssl/opensslv.h |  4 ++--
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/CHANGES.BabaSSL b/CHANGES.BabaSSL
index c7e046811..0724de71a 100644
--- a/CHANGES.BabaSSL
+++ b/CHANGES.BabaSSL
@@ -5,9 +5,35 @@
  This is a high-level summary of the most important changes.
  For a full list of changes, see the git commit log.
 
- Changes between 8.2.0 and 8.3.0 [xx XXX xxxx]
+ Changes between 8.2.0 and 8.3.0 [28 Feb 2022]
 
-  *)
+  *) Fix CVE-2021-4160
+
+  *) Support wrap mode in `openssl enc` command
+
+  *) ASYNC: Fixes for nested job creation
+
+  *) Support TLS certificate compression (RFC 8879)
+
+  *) A bundle of upstream patches are backported [hustliyilin]
+
+  *) Support NTLS session ticket
+
+  *) Support integrity algorithm 128-EIA3
+
+  *) Support NTLS client authentication
+
+  *) Remove ARIA cipher
+
+  *) Support software random generator in compliance with Chinese SCA
+
+  *) Support PHE algorithm EC-Elgamal
+
+  *) Support RSA_SM4 cipher suites for NTLS
+
+  *) SM3 and SM4 hardware acceleration on aarch64
+
+  *) SM4 optimization for non-asm mode
 
  Changes between 8.1.3 and 8.2.0 [19 May 2021]
 
diff --git a/include/openssl/opensslv.h b/include/openssl/opensslv.h
index 4d3fb2ded..81ab20f66 100644
--- a/include/openssl/opensslv.h
+++ b/include/openssl/opensslv.h
@@ -108,8 +108,8 @@ extern "C" {
  * 1.9.5          0x1090500f
  */
 
-# define BABASSL_VERSION_NUMBER  0x80300000L
-# define BABASSL_VERSION_TEXT    "BabaSSL 8.3.0-dev"
+# define BABASSL_VERSION_NUMBER  0x8030000fL
+# define BABASSL_VERSION_TEXT    "BabaSSL 8.3.0"
 
 #ifdef  __cplusplus
 }