aboutsummaryrefslogtreecommitdiff
path: root/android/olm-sdk/src/main/java
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2018-06-27 17:38:14 -0400
committerHubert Chathi <hubert@uhoreg.ca>2018-06-27 18:49:48 -0400
commit307309c69b99087489a5d2d2eccecee7751fead6 (patch)
tree21328bb745b6919bf16dc50e5e3ec779fafd66cd /android/olm-sdk/src/main/java
parent552da6eafecc29f6900854ebe7c55fa8a96002e4 (diff)
add initial version of Android wrapper for public key API
Diffstat (limited to 'android/olm-sdk/src/main/java')
-rw-r--r--android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java8
-rw-r--r--android/olm-sdk/src/main/java/org/matrix/olm/OlmPkDecryption.java78
-rw-r--r--android/olm-sdk/src/main/java/org/matrix/olm/OlmPkEncryption.java89
-rw-r--r--android/olm-sdk/src/main/java/org/matrix/olm/OlmPkMessage.java23
4 files changed, 198 insertions, 0 deletions
diff --git a/android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
index 33ac49e..31b5729 100644
--- a/android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
@@ -61,6 +61,14 @@ public class OlmException extends IOException {
public static final int EXCEPTION_CODE_UTILITY_CREATION = 500;
public static final int EXCEPTION_CODE_UTILITY_VERIFY_SIGNATURE = 501;
+ public static final int EXCEPTION_CODE_PK_ENCRYPTION_CREATION = 600;
+ public static final int EXCEPTION_CODE_PK_ENCRYPTION_SET_RECIPIENT_KEY = 601;
+ public static final int EXCEPTION_CODE_PK_ENCRYPTION_ENCRYPT = 602;
+
+ public static final int EXCEPTION_CODE_PK_DECRYPTION_CREATION = 700;
+ public static final int EXCEPTION_CODE_PK_DECRYPTION_GENERATE_KEY = 701;
+ public static final int EXCEPTION_CODE_PK_DECRYPTION_DECRYPT = 702;
+
// exception human readable messages
public static final String EXCEPTION_MSG_INVALID_PARAMS_DESERIALIZATION = "invalid de-serialized parameters";
diff --git a/android/olm-sdk/src/main/java/org/matrix/olm/OlmPkDecryption.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmPkDecryption.java
new file mode 100644
index 0000000..03d055a
--- /dev/null
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmPkDecryption.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2018 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.olm;
+
+import android.util.Log;
+
+public class OlmPkDecryption {
+ private static final String LOG_TAG = "OlmPkDecryption";
+
+ /** Session Id returned by JNI.
+ * This value uniquely identifies the native session instance.
+ **/
+ private transient long mNativeId;
+
+ public OlmPkDecryption() throws OlmException {
+ try {
+ mNativeId = createNewPkDecryptionJni();
+ } catch (Exception e) {
+ throw new OlmException(OlmException.EXCEPTION_CODE_PK_DECRYPTION_CREATION, e.getMessage());
+ }
+ }
+
+ private native long createNewPkDecryptionJni();
+
+ private native void releasePkDecryptionJni();
+
+ public void releaseDecryption() {
+ if (0 != mNativeId) {
+ releasePkDecryptionJni();
+ }
+ mNativeId = 0;
+ }
+
+ public boolean isReleased() {
+ return (0 == mNativeId);
+ }
+
+ public String generateKey() throws OlmException {
+ try {
+ byte[] key = generateKeyJni();
+ return new String(key, "UTF-8");
+ } catch (Exception e) {
+ Log.e(LOG_TAG, "## setRecipientKey(): failed " + e.getMessage());
+ throw new OlmException(OlmException.EXCEPTION_CODE_PK_DECRYPTION_GENERATE_KEY, e.getMessage());
+ }
+ }
+
+ private native byte[] generateKeyJni();
+
+ public String decrypt(OlmPkMessage aMessage) throws OlmException {
+ if (null == aMessage) {
+ return null;
+ }
+
+ try {
+ return new String(decryptJni(aMessage), "UTF-8");
+ } catch (Exception e) {
+ Log.e(LOG_TAG, "## pkDecrypt(): failed " + e.getMessage());
+ throw new OlmException(OlmException.EXCEPTION_CODE_PK_DECRYPTION_DECRYPT, e.getMessage());
+ }
+ }
+
+ private native byte[] decryptJni(OlmPkMessage aMessage);
+}
diff --git a/android/olm-sdk/src/main/java/org/matrix/olm/OlmPkEncryption.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmPkEncryption.java
new file mode 100644
index 0000000..9bd429d
--- /dev/null
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmPkEncryption.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2018 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.olm;
+
+import android.util.Log;
+
+public class OlmPkEncryption {
+ private static final String LOG_TAG = "OlmPkEncryption";
+
+ /** Session Id returned by JNI.
+ * This value uniquely identifies the native session instance.
+ **/
+ private transient long mNativeId;
+
+ public OlmPkEncryption() throws OlmException {
+ try {
+ mNativeId = createNewPkEncryptionJni();
+ } catch (Exception e) {
+ throw new OlmException(OlmException.EXCEPTION_CODE_PK_ENCRYPTION_CREATION, e.getMessage());
+ }
+ }
+
+ private native long createNewPkEncryptionJni();
+
+ private native void releasePkEncryptionJni();
+
+ public void releaseEncryption() {
+ if (0 != mNativeId) {
+ releasePkEncryptionJni();
+ }
+ mNativeId = 0;
+ }
+
+ public boolean isReleased() {
+ return (0 == mNativeId);
+ }
+
+ public void setRecipientKey(String aKey) throws OlmException {
+ if (null == aKey) {
+ return;
+ }
+
+ try {
+ setRecipientKeyJni(aKey.getBytes("UTF-8"));
+ } catch (Exception e) {
+ Log.e(LOG_TAG, "## setRecipientKey(): failed " + e.getMessage());
+ throw new OlmException(OlmException.EXCEPTION_CODE_PK_ENCRYPTION_SET_RECIPIENT_KEY, e.getMessage());
+ }
+ }
+
+ private native void setRecipientKeyJni(byte[] aKey);
+
+ public OlmPkMessage encrypt(String aPlaintext) throws OlmException {
+ if (null == aPlaintext) {
+ return null;
+ }
+
+ OlmPkMessage encryptedMsgRetValue = new OlmPkMessage();
+
+ try {
+ byte[] ciphertextBuffer = encryptJni(aPlaintext.getBytes("UTF-8"), encryptedMsgRetValue);
+
+ if (null != ciphertextBuffer) {
+ encryptedMsgRetValue.mCipherText = new String(ciphertextBuffer, "UTF-8");
+ }
+ } catch (Exception e) {
+ Log.e(LOG_TAG, "## pkEncrypt(): failed " + e.getMessage());
+ throw new OlmException(OlmException.EXCEPTION_CODE_PK_ENCRYPTION_ENCRYPT, e.getMessage());
+ }
+
+ return encryptedMsgRetValue;
+ }
+
+ private native byte[] encryptJni(byte[] plaintext, OlmPkMessage aMessage);
+}
diff --git a/android/olm-sdk/src/main/java/org/matrix/olm/OlmPkMessage.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmPkMessage.java
new file mode 100644
index 0000000..f8a065a
--- /dev/null
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmPkMessage.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2018 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.matrix.olm;
+
+public class OlmPkMessage {
+ public String mCipherText;
+ public String mMac;
+ public String mEphemeralKey;
+}