diff options
author | cyBerta <cyberta@riseup.net> | 2023-10-29 15:58:52 +0100 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2023-10-29 15:58:52 +0100 |
commit | 50defeaff2a8468ee44db7e09752e334e4d1ba2c (patch) | |
tree | cca77a33f5b3266b9b0462136057ae47f6b146d4 /main/src/skeleton/java/de/blinkt/openvpn/core | |
parent | 45f67a08b481f2f727556a36e28d17a3f68d435a (diff) | |
parent | 87aac67b611f616aebfb722679b40e3f49576f01 (diff) |
Merge branch 'schwabe_master' into ssh_new_master
Diffstat (limited to 'main/src/skeleton/java/de/blinkt/openvpn/core')
-rw-r--r-- | main/src/skeleton/java/de/blinkt/openvpn/core/ProfileEncryption.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/src/skeleton/java/de/blinkt/openvpn/core/ProfileEncryption.java b/main/src/skeleton/java/de/blinkt/openvpn/core/ProfileEncryption.java index c526a69f..1f5651ab 100644 --- a/main/src/skeleton/java/de/blinkt/openvpn/core/ProfileEncryption.java +++ b/main/src/skeleton/java/de/blinkt/openvpn/core/ProfileEncryption.java @@ -15,7 +15,7 @@ import java.security.GeneralSecurityException; /* Dummy class that supports no encryption */ class ProfileEncryption { - static void initMasterCryptAlias() + static void initMasterCryptAlias(Context context) { } |