schwabe · jsoref · Jan 31, 2020 · Jan 31, 2020 · Jan 31, 2020 · Jan 31, 2020
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ Developing
 ---------------
 If you want to develop on ics-openvpn please read the [doc/README.txt](https://github.com/schwabe/ics-openvpn/blob/master/doc/README.txt) *before* opening issues or emailing me. 
 
-Also please note that before contributing to the project that I would like to retain my ability to relicense the project for different third parties and therefore probably need a contributer's agreement from any contributing party. To get started, [sign the Contributor License Agreement](https://www.clahub.com/agreements/schwabe/ics-openvpn).
+Also please note that before contributing to the project that I would like to retain my ability to relicense the project for different third parties and therefore probably need a contributor's agreement from any contributing party. To get started, [sign the Contributor License Agreement](https://www.clahub.com/agreements/schwabe/ics-openvpn).
 
 You can help
 ------------
@@ -37,7 +37,7 @@ You make your life and that of your users easier if you embed the certificates i
 
 Inline files are supported since OpenVPN 2.1rc1 and documented in the  [OpenVPN 2.3 man page](https://community.openvpn.net/openvpn/wiki/Openvpn23ManPage) (under INLINE FILE SUPPORT) 
 
-(Using inline certifaces can also make your life on non-Android platforms easier since you only have one file.)
+(Using inline certificates can also make your life on non-Android platforms easier since you only have one file.)
 
 For example `ca mycafile.pem` becomes
 ```

diff --git a/doc/LICENSE.txt b/doc/LICENSE.txt
@@ -8,7 +8,7 @@ Copyright (c) 2012-2014, Arne Schwabe
 
 The name ics-openvpn and OpenVPN for Android refer to the same program.
 OpenVPN for Android is distributed under the GPL license version 2 (see Below)
-with the following clarification/additional terms of what constitues "deriviate work":
+with the following clarification/additional terms of what constitutes "derivative work":
 
 Using/including any part of ics-openvpn, especially using/including any part of the
 de.blinkt.openvpn class hierarchy, creates derivative work of ics-openvpn.

diff --git a/doc/todo.txt b/doc/todo.txt
@@ -27,6 +27,6 @@ Tap support:
    - generate random mac
    - strip macs header on receive
    - append mac header on send
-   - implement arp, just discrad real packet and lets Android/other site retry later, "Cisco style"
+   - implement arp, just discard real packet and lets Android/other site retry later, "Cisco style"
 
 
diff --git a/main/src/main/aidl/de/blinkt/openvpn/api/ExternalCertificateProvider.aidl b/main/src/main/aidl/de/blinkt/openvpn/api/ExternalCertificateProvider.aidl
@@ -9,14 +9,14 @@ package de.blinkt.openvpn.api;
 interface ExternalCertificateProvider {
     /**
      * Requests signing the data with RSA/ECB/PKCS1PADDING
-     * for RSA certficate and with NONEwithECDSA for EC certificates
+     * for RSA certificate and with NONEwithECDSA for EC certificates
      * @parm alias the parameter that
      */
     byte[] getSignedData(in String alias, in byte[] data);
 
     /**
      * Requests the certificate chain for the selected alias
-     * The first certifcate returned is assumed to be
+     * The first certificate returned is assumed to be
      * the user certificate
      */
     byte[] getCertificateChain(in String alias);

diff --git a/main/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl b/main/src/main/aidl/de/blinkt/openvpn/api/IOpenVPNAPIService.aidl
@@ -13,7 +13,7 @@ interface IOpenVPNAPIService {
 	void startProfile (String profileUUID);
 
 	/** Use a profile with all certificates etc. embedded,
-	 * old version which does not return the UUID of the addded profile, see
+	 * old version which does not return the UUID of the added profile, see
 	 * below for a version that return the UUID on add */
 	boolean addVPNProfile (String name, String config);
 
@@ -35,10 +35,10 @@ interface IOpenVPNAPIService {
 	/* Disconnect the VPN */
     void disconnect();
 
-    /* Pause the VPN (same as using the pause feature in the notifcation bar) */
+    /* Pause the VPN (same as using the pause feature in the notification bar) */
     void pause();
 
-    /* Resume the VPN (same as using the pause feature in the notifcation bar) */
+    /* Resume the VPN (same as using the pause feature in the notification bar) */
     void resume();
 
     /**

diff --git a/main/src/main/aidl/de/blinkt/openvpn/core/IOpenVPNServiceInternal.aidl b/main/src/main/aidl/de/blinkt/openvpn/core/IOpenVPNServiceInternal.aidl
@@ -25,5 +25,5 @@ interface IOpenVPNServiceInternal {
 
     boolean isAllowedExternalApp(String packagename);
 
-    void challengeResponse(String repsonse);
+    void challengeResponse(String response);
 }
diff --git a/main/src/main/aidl/de/blinkt/openvpn/core/IServiceStatus.aidl b/main/src/main/aidl/de/blinkt/openvpn/core/IServiceStatus.aidl
@@ -20,7 +20,7 @@ interface IServiceStatus {
         void unregisterStatusCallback(in IStatusCallbacks cb);
 
         /**
-         * Returns the last connedcted VPN
+         * Returns the last connected VPN
          */
         String getLastConnectedVPN();
 

diff --git a/main/src/main/cpp/CMakeLists.txt b/main/src/main/cpp/CMakeLists.txt
@@ -52,7 +52,7 @@ if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*s
     #INCLUDE(${SWIG_USE_FILE})
     #SET_SOURCE_FILES_PROPERTIES(openvpn3/javacli/ovpncli.i PROPERTIES SWIG_FLAGS "-package net.openvpn.ovpn3")
     #SET_SOURCE_FILES_PROPERTIES(openvpn3/javacli/ovpncli.i PROPERTIES CPLUSPLUS ON)
-    #SWIG_ADD_MODULE(ovpen3cli java openvpn3/javacli/ovpncli.i)
+    #SWIG_ADD_MODULE(ovpn3cli java openvpn3/javacli/ovpncli.i)
 
 
     set(ovpn3_SRCS
@@ -95,7 +95,7 @@ if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*s
 
             )
 else ()
-    message("Not budiling OpenVPN for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+    message("Not building OpenVPN for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 endif ()
 
 add_library(opvpnutil SHARED opvpnutil/jniglue.c opvpnutil/scan_ifs.c)
@@ -110,7 +110,7 @@ if (NOT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} MATCHES "build/intermediates/cmake/.*s
     add_library(osslspeedtest SHARED opvpnutil/sslspeed.c)
     target_link_libraries(osslspeedtest log crypto ssl)
 else ()
-    message("Not budiling SSLSpeedTest for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+    message("Not building SSLSpeedTest for output dir ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 endif ()
 
 # The magic Jellybean keystore signing hack. Beware dragons and dlsyms magic ahead

diff --git a/main/src/main/cpp/jbcrypto/jbcrypto.cpp b/main/src/main/cpp/jbcrypto/jbcrypto.cpp
@@ -1,5 +1,5 @@
 //
-//  JBCyrpto.cpp
+//  JBCrypto.cpp
 //  xcopenvpn
 //
 //  Created by Arne Schwabe on 12.07.12.
@@ -97,8 +97,8 @@ jbyteArray Java_de_blinkt_openvpn_core_NativeUtils_rsasign (JNIEnv* env, jclass,
         sigret, &siglen, pkey->pkey.rsa) <= 0 ) */
 
     RSA_private_encrypt_dyn=(int (*)(int, const unsigned char *, unsigned char *, RSA *, int)) dlsym(RTLD_DEFAULT, "RSA_private_encrypt");
-    int paddding = pkcs1padding ? RSA_PKCS1_PADDING : RSA_NO_PADDING;
-    siglen = RSA_private_encrypt_dyn(datalen,(unsigned char*) data,sigret,pkey->pkey.rsa, paddding);
+    int padding = pkcs1padding ? RSA_PKCS1_PADDING : RSA_NO_PADDING;
+    siglen = RSA_private_encrypt_dyn(datalen,(unsigned char*) data,sigret,pkey->pkey.rsa, padding);
 
     if (siglen < 0)
 	{

diff --git a/main/src/main/cpp/openvpn-config/config.h b/main/src/main/cpp/openvpn-config/config.h
@@ -3,7 +3,7 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
 
-/* DISABLE PERSISTEN TUN */
+/* DISABLE PERSISTENT TUN */
 #undef TUNSETPERSIST
 
 /* Enable deferred authentication */

diff --git a/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java b/main/src/main/java/de/blinkt/openvpn/LaunchVPN.java
@@ -321,10 +321,10 @@ void launchVPN() {
         boolean loadTunModule = prefs.getBoolean("loadTunModule", false);
 
         if (loadTunModule)
-            execeuteSUcmd("insmod /system/lib/modules/tun.ko");
+            executeSUcmd("insmod /system/lib/modules/tun.ko");
 
         if (usecm9fix && !mCmfixed) {
-            execeuteSUcmd("chown system /dev/tun");
+            executeSUcmd("chown system /dev/tun");
         }
 
         if (intent != null) {
@@ -345,7 +345,7 @@ void launchVPN() {
 
     }
 
-    private void execeuteSUcmd(String command) {
+    private void executeSUcmd(String command) {
         try {
             ProcessBuilder pb = new ProcessBuilder("su", "-c", command);
             Process p = pb.start();

diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -84,8 +84,8 @@ public class VpnProfile implements Serializable, Cloneable {
     private static final int AUTH_RETRY_INTERACT = 3;
     public static String DEFAULT_DNS1 = "8.8.8.8";
     public static String DEFAULT_DNS2 = "8.8.4.4";
-    // variable named wrong and should haven beeen transient
-    // but needs to keep wrong name to guarante loading of old
+    // variable named wrong and should haven been transient
+    // but needs to keep wrong name to guarantee loading of old
     // profiles
     public transient boolean profileDeleted = false;
     public int mAuthenticationType = TYPE_KEYSTORE;
@@ -1007,7 +1007,7 @@ public int checkProfile(Context context, boolean useOpenVPN3) {
             if (c.mProxyType == Connection.ProxyType.ORBOT) {
                 if (usesExtraProxyOptions())
                     return R.string.error_orbot_and_proxy_options;
-                if (!OrbotHelper.checkTorReceier(context))
+                if (!OrbotHelper.checkTorReceiver(context))
                     return R.string.no_orbotfound;
             }
         }

diff --git a/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
@@ -75,7 +75,7 @@ private void showDisconnectDialog() {
     @Override
     public void onClick(DialogInterface dialog, int which) {
         if (which == DialogInterface.BUTTON_POSITIVE) {
-            ProfileManager.setConntectedVpnProfileDisconnected(this);
+            ProfileManager.setConnectedVpnProfileDisconnected(this);
             if (mService != null) {
                 try {
                     mService.stopVPN(false);

diff --git a/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java b/main/src/main/java/de/blinkt/openvpn/core/CIDRIP.java
@@ -32,7 +32,7 @@ public static int calculateLenFromMask(String mask) {
         int len;
         // Check if rest of netmask is only 1s
         if (netmask != (0x1ffffffffl >> lenZeros)) {
-            // Asume no CIDR, set /32
+            // Assume no CIDR, set /32
             len = 32;
         } else {
             len = 32 - lenZeros;

diff --git a/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
@@ -251,7 +251,7 @@ public String getAuthUserPassFile() {
 
     private boolean space(char c) {
         // I really hope nobody is using zero bytes inside his/her config file
-        // to sperate parameter but here we go:
+        // to separate parameter but here we go:
         return Character.isWhitespace(c) || c == '\0';
 
     }
@@ -471,7 +471,7 @@ public VpnProfile convertProfile() throws ConfigParseError, IOException {
             }
             // Ignore mtu argument of OpenVPN3 and report error otherwise
             if (mssfix.size() >= 3 && !(mssfix.get(2).equals("mtu"))) {
-                throw new ConfigParseError("Second argument to --mssfix unkonwn");
+                throw new ConfigParseError("Second argument to --mssfix unknown");
             }
         }
 
@@ -517,7 +517,7 @@ public VpnProfile convertProfile() throws ConfigParseError, IOException {
                 CIDRIP cidr = new CIDRIP(ifconfig.get(1), ifconfig.get(2));
                 np.mIPv4Address = cidr.toString();
             } catch (NumberFormatException nfe) {
-                throw new ConfigParseError("Could not pase ifconfig IP address: " + nfe.getLocalizedMessage());
+                throw new ConfigParseError("Could not parse ifconfig IP address: " + nfe.getLocalizedMessage());
             }
 
         }

diff --git a/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java b/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
@@ -126,9 +126,9 @@ public void userPause(boolean pause) {
         }
     }
 
-    public DeviceStateReceiver(OpenVPNManagement magnagement) {
+    public DeviceStateReceiver(OpenVPNManagement management) {
         super();
-        mManagement = magnagement;
+        mManagement = management;
         mManagement.setPauseCallback(this);
         mDisconnectHandler = new Handler();
     }
@@ -262,7 +262,7 @@ public void networkStateChange(Context context) {
 
         if (!netstatestring.equals(lastStateMsg))
             VpnStatus.logInfo(R.string.netstatus, netstatestring);
-        VpnStatus.logDebug(String.format("Debug state info: %s, pause: %s, shouldbeconnected: %s, network: %s ",
+        VpnStatus.logDebug(String.format("Debug state info: %s, pause: %s, shouldBeconnected: %s, network: %s ",
                 netstatestring, getPauseReason(), shouldBeConnected(), network));
         lastStateMsg = netstatestring;
 

diff --git a/main/src/main/java/de/blinkt/openvpn/core/ExtAuthHelper.java b/main/src/main/java/de/blinkt/openvpn/core/ExtAuthHelper.java
@@ -209,7 +209,7 @@ public void onServiceDisconnected(ComponentName name) {
         intent.setPackage(packagename);
 
         if (!context.bindService(intent, extAuthServiceConnection, Context.BIND_AUTO_CREATE)) {
-            throw new KeyChainException("could not bind to external authticator app: " + packagename);
+            throw new KeyChainException("could not bind to external authenticator app: " + packagename);
         }
         return new ExternalAuthProviderConnection(context, extAuthServiceConnection, q.take());
     }

diff --git a/main/src/main/java/de/blinkt/openvpn/core/LogFileHandler.java b/main/src/main/java/de/blinkt/openvpn/core/LogFileHandler.java
@@ -90,7 +90,7 @@ private void writeLogItemToDisk(LogItem li) throws IOException {
         // We do not really care if the log cache breaks between Android upgrades,
         // write binary format to disc
 
-        byte[] liBytes = li.getMarschaledBytes();
+        byte[] liBytes = li.getMarshaledBytes();
 
         writeEscapedBytes(liBytes);
     }