Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
1eac1daa
Commit
1eac1daa
authored
Oct 13, 2018
by
Hubert Chathi
Browse files
use new function names in Android bindings
parent
8c1169f0
Changes
1
Hide whitespace changes
Inline
Side-by-side
android/olm-sdk/src/main/jni/olm_pk.cpp
View file @
1eac1daa
...
@@ -366,7 +366,7 @@ JNIEXPORT void OLM_PK_DECRYPTION_FUNC_DEF(releasePkDecryptionJni)(JNIEnv *env, j
...
@@ -366,7 +366,7 @@ JNIEXPORT void OLM_PK_DECRYPTION_FUNC_DEF(releasePkDecryptionJni)(JNIEnv *env, j
JNIEXPORT
jbyteArray
OLM_PK_DECRYPTION_FUNC_DEF
(
generateKeyJni
)(
JNIEnv
*
env
,
jobject
thiz
)
JNIEXPORT
jbyteArray
OLM_PK_DECRYPTION_FUNC_DEF
(
generateKeyJni
)(
JNIEnv
*
env
,
jobject
thiz
)
{
{
size_t
randomLength
=
olm_pk_
gener
ate_key_
random_
length
();
size_t
randomLength
=
olm_pk_
priv
ate_key_length
();
uint8_t
*
randomBuffPtr
=
NULL
;
uint8_t
*
randomBuffPtr
=
NULL
;
jbyteArray
publicKeyRet
=
0
;
jbyteArray
publicKeyRet
=
0
;
...
@@ -393,7 +393,7 @@ JNIEXPORT jbyteArray OLM_PK_DECRYPTION_FUNC_DEF(generateKeyJni)(JNIEnv *env, job
...
@@ -393,7 +393,7 @@ JNIEXPORT jbyteArray OLM_PK_DECRYPTION_FUNC_DEF(generateKeyJni)(JNIEnv *env, job
}
}
else
else
{
{
if
(
olm_pk_
generate_key
(
decryptionPtr
,
publicKeyPtr
,
publicKeyLength
,
randomBuffPtr
,
randomLength
)
==
olm_error
())
if
(
olm_pk_
key_from_private
(
decryptionPtr
,
publicKeyPtr
,
publicKeyLength
,
randomBuffPtr
,
randomLength
)
==
olm_error
())
{
{
errorMessage
=
olm_pk_decryption_last_error
(
decryptionPtr
);
errorMessage
=
olm_pk_decryption_last_error
(
decryptionPtr
);
LOGE
(
"## pkGenerateKeyJni(): failure - olm_pk_generate_key Msg=%s"
,
errorMessage
);
LOGE
(
"## pkGenerateKeyJni(): failure - olm_pk_generate_key Msg=%s"
,
errorMessage
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment