Skip to content

Change way of using salt #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 1, 2024
Merged

Change way of using salt #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f69e89
Change way of using salt
zshbleaker Mar 5, 2024
2193a72
Add macOS support
zshbleaker Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...PIExample/app/src/main/java/io/agora/api/example/examples/advanced/ChannelEncryption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@

import android.content.Context;
import android.os.Bundle;
import android.util.Base64;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.SurfaceView;
Expand All @@ -28,7 +29,6 @@
import com.yanzhenjie.permission.runtime.Permission;

import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;

import io.agora.api.example.MainApplication;
import io.agora.api.example.R;
Expand Down Expand Up @@ -255,7 +255,10 @@ private void enablePacketProcessor(boolean enable) {
}

private byte[] getKdfSaltFromServer() {
return "EncryptionKdfSaltInBase64Strings".getBytes(StandardCharsets.UTF_8);
// Salt string should be the output of the following command:
// openssl rand -base64 32
String saltBase64String = "NiIeJ08AbtcQVjvV+oOEvF/4Dz5dy1CIwa805C8J2w0=";
return Base64.decode(saltBase64String, Base64.DEFAULT);
}

private void joinChannel(String channelId) {
Expand Down
6 changes: 5 additions & 1 deletion iOS/APIExample-OC/APIExample-OC/Examples/Advanced/StreamEncryption/StreamEncryption.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,14 @@ - (void)viewDidLoad {
[AgoraCustomEncryption registerPacketProcessing:self.agoraKit];

} else {
// Salt string should be the output of the following command:
// openssl rand -base64 32
NSString *saltBase64String = @"NiIeJ08AbtcQVjvV+oOEvF/4Dz5dy1CIwa805C8J2w0=";

AgoraEncryptionConfig *config = [[AgoraEncryptionConfig alloc] init];
config.encryptionMode = mode;
config.encryptionKey = secret;
config.encryptionKdfSalt = [@"EncryptionKdfSaltInBase64Strings" dataUsingEncoding:(kCFStringEncodingUTF8)];
config.encryptionKdfSalt = [[NSData alloc] initWithBase64EncodedString:(saltBase64String) options:(0)];
int ret = [self.agoraKit enableEncryption:YES encryptionConfig:config];
if (ret != 0) {
// for errors please take a look at:
Expand Down
5 changes: 4 additions & 1 deletion iOS/APIExample/APIExample/Examples/Advanced/StreamEncryption/StreamEncryption.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,10 @@ class StreamEncryptionMain: BaseViewController {
}

func getEncryptionSaltFromServer() -> Data {
return "EncryptionKdfSaltInBase64Strings".data(using: .utf8) ?? Data()
// Salt string should be the output of the following command:
// openssl rand -base64 32
let saltBase64String = "NiIeJ08AbtcQVjvV+oOEvF/4Dz5dy1CIwa805C8J2w0="
return Data(base64Encoded: saltBase64String.data(using: .utf8)!)!
}

override func willMove(toParent parent: UIViewController?) {
Expand Down
6 changes: 4 additions & 2 deletions macOS/APIExample/Examples/Advanced/StreamEncryption/StreamEncryption.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,10 @@ class StreamEncryption: BaseViewController {
}

func getEncryptionSaltFromServer() -> Data {

return "EncryptionKdfSaltInBase64Strings".data(using: .utf8)!
// Salt string should be the output of the following command:
// openssl rand -base64 32
let saltBase64String = "NiIeJ08AbtcQVjvV+oOEvF/4Dz5dy1CIwa805C8J2w0="
return Data(base64Encoded: saltBase64String.data(using: .utf8)!)!
}

func layoutVideos(_ count: Int) {
Expand Down