Thanks to visit codestin.com
Credit goes to github.com

Skip to content

alts: _Actually_ use Conscrypt when available #6672

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

Merged
merged 1 commit into from
Feb 4, 2020
Merged

alts: _Actually_ use Conscrypt when available #6672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions alts/src/main/java/io/grpc/alts/internal/AesGcmAeadCrypter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import static com.google.common.base.Preconditions.checkArgument;

import com.google.common.annotations.VisibleForTesting;
import io.grpc.internal.ConscryptLoader;
import java.nio.ByteBuffer;
import java.security.GeneralSecurityException;
Expand Down Expand Up @@ -110,7 +111,8 @@ static int getKeyLength() {
return KEY_LENGTH;
}

private static Provider getConscrypt() {
@VisibleForTesting
static Provider getConscrypt() {
if (!ConscryptLoader.isPresent()) {
return null;
}
Expand All @@ -129,7 +131,7 @@ private static Provider getConscrypt() {
return null;
}
try {
Cipher.getInstance(AES_GCM, CONSCRYPT);
Cipher.getInstance(AES_GCM, provider);
} catch (SecurityException t) {
// Pre-Java 7u121/Java 8u111 fails with SecurityException:
// JCE cannot authenticate the provider Conscrypt
Expand Down
34 changes: 34 additions & 0 deletions alts/src/test/java/io/grpc/alts/internal/AesGcmAeadCrypterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright 2020 The gRPC Authors
*
* 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 io.grpc.alts.internal;

import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.TruthJUnit.assume;

import org.conscrypt.Conscrypt;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;

@RunWith(JUnit4.class)
public final class AesGcmAeadCrypterTest {
@Test
public void getConscrypt_worksWhenConscryptIsAvailable() {
assume().that(Conscrypt.isAvailable()).isTrue();
assertThat(AesGcmAeadCrypter.getConscrypt()).isNotNull();
}
}