Merge pull request from dev to main for release 2.2.3

merge from dev to main for release2.2.3

Author: weihongqin163

README.cn.md

@@ -38,6 +38,10 @@ python agora_rtc/examples/example_audio_pcm_send.py --appId=xxx --channelId=xxx
 
 # 更新日志
 ## todo：
+## 2025.04.14 发布 2.2.3
+-- Fix: 
+  -- 修复了enable_encryption 在salt 处理中的一个bug
+  -- 更新在enable_encryption 中的逻辑，当enable为0的时候，不做处理
 ## 2025.04.10 发布 2.2.2
 -- Add:
   - push_video_encoded_file.py: 支持推送mp4文件；支持推送h264编码的h.264文件；其中里面有从mp4文件的avformat转换为raw 264流的annex B格式的转换。

README.md

@@ -35,6 +35,11 @@ python agora_rtc/examples/example_audio_pcm_send.py --appId=xxx --channelId=xxx
 ```
 
 # Change log
+
+## 2025.04.14 Release 2.2.3
+-- Fix: 
+  -- Fixed a bug in the salt processing in enable_encryption
+  -- Updated the logic in enable_encryption, no processing when enable is 0
 2025.04.10 Release 2.2.2
 -- Additions:
   - Added push_video_encoded_file.py to support pushing mp4 files and h264 encoded h.264 files. Includes conversion from mp4 file avformat to raw 264 stream in annex B format.

agora_rtc/README.cn.md

@@ -37,6 +37,10 @@ python agora_rtc/examples/example_audio_pcm_send.py --appId=xxx --channelId=xxx
 ```
 
 # 更新日志
+## 2025.04.14 发布 2.2.3
+-- Fix: 
+  -- 修复了enable_encryption 在salt 处理中的一个bug
+  -- 更新在enable_encryption 中的逻辑，当enable为0的时候，不做处理
 ## 2025.04.10 发布 2.2.2
 -- Add:
   - push_video_encoded_file.py: 支持推送mp4文件；支持推送h264编码的h.264文件；其中里面有从mp4文件的avformat转换为raw 264流的annex B格式的转换。

agora_rtc/README.md

@@ -35,6 +35,10 @@ python agora_rtc/examples/example_audio_pcm_send.py --appId=xxx --channelId=xxx
 ```
 
 # Change log
+## 2025.04.14 Release 2.2.3
+-- Fix: 
+  -- Fixed a bug in the salt processing in enable_encryption
+  -- Updated the logic in enable_encryption, no processing when enable is 0
 2025.04.10 Release 2.2.2
 -- Additions:
   - Added push_video_encoded_file.py to support pushing mp4 files and h264 encoded h.264 files. Includes conversion from mp4 file avformat to raw 264 stream in annex B format.

agora_rtc/agora/rtc/_ctypes_handle/_ctypes_data.py

@@ -1234,10 +1234,13 @@ def create(config: EncryptionConfig) -> 'EncryptionConfigInner':
         if length > 32:
             length = 32
         #change bytearray to uint8 * length
-        if length > 0:
-            encryption_kdf_salt = (ctypes.c_uint8 * length)(*config.encryption_kdf_salt)
-        else:
-            encryption_kdf_salt = (ctypes.c_uint8 * 32)() # 32 bytes,empty array
+        encryption_kdf_salt = (ctypes.c_uint8 * 32)() # 32 bytes,empty array
+        # get min length of config.encryption_kdf_salt and 32
+        min_length = min(length, 32)
+        #copy config.encryption_kdf_salt to encryption_kdf_salt
+        for i in range(min_length):
+            encryption_kdf_salt[i] = config.encryption_kdf_salt[i]
+      
         # change encryption_key to c_char_p
         encryption_key = config.encryption_key.encode('utf-8') if config.encryption_key else None
         #change None to c_char_p

agora_rtc/agora/rtc/rtc_connection.py

@@ -149,6 +149,9 @@ def enable_encryption(self, enabled: int, config: EncryptionConfig) -> int:
         Note:
             This method must be called before self.connect()
         """
+        if enabled == 0:
+            return 0
+        
         inner_config = EncryptionConfigInner.create(config)
         return agora_rtc_conn_enable_encryption(self.conn_handle, enabled, ctypes.byref(inner_config))
 

agora_rtc/setup.py

@@ -58,7 +58,7 @@ def download_and_extract_sdk(self):
 
 setup(
     name='agora_python_server_sdk',
-    version='2.2.2',
+    version='2.2.3',
     description='A Python SDK for Agora Server',
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',