Skip to content
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

Jump to bottom

Adding HPKE support for crypto operations per RFC-9180 #1146

Merged
merged 18 commits into from
Aug 15, 2023
Merged

Adding HPKE support for crypto operations per RFC-9180 #1146

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
85a2056
Adding HPKE support for crypto operations per RFC-9180
Jun 9, 2023
a1d4945
Remove blank line on HpkeTestingContextHelper
jorgesaldivar Jun 9, 2023
bedec42
Update package line in HpkeTestingContextHelper
jorgesaldivar Jun 9, 2023
8f98c92
Update Hpke access identifier to enable test in android
jorgesaldivar Jun 10, 2023
d2b0bd0
Update HpkeContextHelper access identifier to enable test in android
jorgesaldivar Jun 10, 2023
a759cbb
Merge branch 'google:master' into hpke-api
jorgesaldivar Jul 17, 2023
1265720
Addressed PR #1146 comments
Jul 19, 2023
184d766
Address PR comments moved two-state API into factory consctructor
Jul 25, 2023
8b01b7f
Add suite validation to setup methods
Jul 25, 2023
f9a9a2c
Merge branch 'master' into hpke-api
jorgesaldivar Aug 10, 2023
0413318
Remove the size check on pk/sk after checking their type
Aug 10, 2023
f31190c
Updated SecretKeySpec to XdhKeySpec within OpenSSLXDHKeyFactory
Aug 11, 2023
0ed04d7
Format hpke related code with clang
Aug 11, 2023
ecb34cd
Append documentation to XdhKeySpec
Aug 11, 2023
63621e5
Merge branch 'google:master' into hpke-api
jorgesaldivar Aug 11, 2023
89d0a44
Updated hpke native_crypto to use optional instead of unique_ptr
Aug 11, 2023
b677d73
Updated optional .value() with operator ->
Aug 14, 2023
edb4e19
Rephrased documentation for encryting and decrypting methods
Aug 14, 2023
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
5 changes: 5 additions & 0 deletions common/src/jni/main/cpp/conscrypt/jniutil.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ JavaVM *gJavaVM;
jclass cryptoUpcallsClass;
jclass openSslInputStreamClass;
jclass nativeRefClass;
jclass nativeRefHpkeCtxClass;

jclass byteArrayClass;
jclass calendarClass;
Expand Down Expand Up @@ -57,6 +58,7 @@ jmethodID buffer_isDirectMethod;
jmethodID cryptoUpcallsClass_rawSignMethod;
jmethodID cryptoUpcallsClass_rsaSignMethod;
jmethodID cryptoUpcallsClass_rsaDecryptMethod;
jmethodID nativeRefHpkeCtxClass_constructor;
jmethodID sslHandshakeCallbacks_verifyCertificateChain;
jmethodID sslHandshakeCallbacks_onSSLStateChange;
jmethodID sslHandshakeCallbacks_clientCertificateRequested;
Expand Down Expand Up @@ -86,6 +88,8 @@ void init(JavaVM* vm, JNIEnv* env) {
env, TO_STRING(JNI_JARJAR_PREFIX) "org/conscrypt/CryptoUpcalls");
nativeRefClass = getGlobalRefToClass(
env, TO_STRING(JNI_JARJAR_PREFIX) "org/conscrypt/NativeRef");
nativeRefHpkeCtxClass = getGlobalRefToClass(
env, TO_STRING(JNI_JARJAR_PREFIX) "org/conscrypt/NativeRef$EVP_HPKE_CTX");
openSslInputStreamClass = getGlobalRefToClass(
env, TO_STRING(JNI_JARJAR_PREFIX) "org/conscrypt/OpenSSLBIOInputStream");
sslHandshakeCallbacksClass = getGlobalRefToClass(
Expand Down Expand Up @@ -145,6 +149,7 @@ void init(JavaVM* vm, JNIEnv* env) {
if (cryptoUpcallsClass_rsaDecryptMethod == nullptr) {
env->FatalError("Could not find rsaDecryptWithPrivateKey");
}
nativeRefHpkeCtxClass_constructor = env->GetMethodID(nativeRefHpkeCtxClass, "<init>", "(J)V");
}

void jniRegisterNativeMethods(JNIEnv* env, const char* className, const JNINativeMethod* gMethods,
Expand Down
Loading