Skip to content

Revert "Add cipher usage metrics to Conscrypt" #1344

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
miguelaranda0 merged 2 commits into from
Jun 10, 2025
Merged

Revert "Add cipher usage metrics to Conscrypt" #1344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb797e2
Revert "Add cipher usage metrics to Conscrypt"
miguelaranda0 May 27, 2025
a072b50
Merge branch 'master' into nomet
miguelaranda0 Jun 10, 2025
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
4 changes: 0 additions & 4 deletions common/src/main/java/org/conscrypt/OpenSSLAeadCipher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,6 @@ protected OpenSSLAeadCipher(Mode mode) {
super(mode, Padding.NOPADDING);
}

protected OpenSSLAeadCipher(Mode mode, int cipherId, int modeId, int paddingId) {
super(mode, Padding.NOPADDING, cipherId, modeId, paddingId);
}

private void checkInitialization() {
if (mustInitialize) {
throw new IllegalStateException(
Expand Down
26 changes: 4 additions & 22 deletions common/src/main/java/org/conscrypt/OpenSSLAeadCipherAES.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@

package org.conscrypt;

import static org.conscrypt.metrics.MetricsAlgorithm.CIPHER;
import static org.conscrypt.metrics.MetricsCipher.AES;
import static org.conscrypt.metrics.MetricsMode.GCM;
import static org.conscrypt.metrics.MetricsMode.GCM_SIV;
import static org.conscrypt.metrics.MetricsPadding.NO_PADDING;

import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
Expand Down Expand Up @@ -138,10 +132,7 @@ long getEVP_AEAD(int keyLength) throws InvalidKeyException {
}

public static class AES_128 extends GCM {
public AES_128() {
Platform.getStatsLog().countServiceUsage(
CIPHER.getId(), AES.getId(), GCM.getId(), NO_PADDING.getId());
}
public AES_128() {}

@Override
void checkSupportedKeySize(int keyLength) throws InvalidKeyException {
Expand All @@ -153,10 +144,7 @@ void checkSupportedKeySize(int keyLength) throws InvalidKeyException {
}

public static class AES_256 extends GCM {
public AES_256() {
Platform.getStatsLog().countServiceUsage(
CIPHER.getId(), AES.getId(), GCM.getId(), NO_PADDING.getId());
}
public AES_256() {}

@Override
void checkSupportedKeySize(int keyLength) throws InvalidKeyException {
Expand Down Expand Up @@ -208,10 +196,7 @@ long getEVP_AEAD(int keyLength) throws InvalidKeyException {
}

public static class AES_128 extends GCM_SIV {
public AES_128() {
Platform.getStatsLog().countServiceUsage(
CIPHER.getId(), AES.getId(), GCM_SIV.getId(), NO_PADDING.getId());
}
public AES_128() {}

@Override
void checkSupportedKeySize(int keyLength) throws InvalidKeyException {
Expand All @@ -223,10 +208,7 @@ void checkSupportedKeySize(int keyLength) throws InvalidKeyException {
}

public static class AES_256 extends GCM_SIV {
public AES_256() {
Platform.getStatsLog().countServiceUsage(
CIPHER.getId(), AES.getId(), GCM_SIV.getId(), NO_PADDING.getId());
}
public AES_256() {}

@Override
void checkSupportedKeySize(int keyLength) throws InvalidKeyException {
Expand Down
6 changes: 1 addition & 5 deletions common/src/main/java/org/conscrypt/OpenSSLAeadCipherChaCha20.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,13 @@

package org.conscrypt;

import static org.conscrypt.metrics.MetricsCipher.CHACHA20;
import static org.conscrypt.metrics.MetricsMode.POLY1305;
import static org.conscrypt.metrics.MetricsPadding.NO_PADDING;

import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;

@Internal
public class OpenSSLAeadCipherChaCha20 extends OpenSSLAeadCipher {
public OpenSSLAeadCipherChaCha20() {
super(Mode.POLY1305, CHACHA20.getId(), POLY1305.getId(), NO_PADDING.getId());
super(Mode.POLY1305);
}

@Override
Expand Down
7 changes: 0 additions & 7 deletions common/src/main/java/org/conscrypt/OpenSSLCipher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package org.conscrypt;

import static org.conscrypt.metrics.MetricsAlgorithm.CIPHER;

import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
Expand Down Expand Up @@ -135,11 +133,6 @@ public static Padding getNormalized(String value) {
blockSize = getCipherBlockSize();
}

OpenSSLCipher(Mode mode, Padding padding, int cipherId, int modeId, int paddingId) {
this(mode, padding);
Platform.getStatsLog().countServiceUsage(CIPHER.getId(), cipherId, modeId, paddingId);
}

/**
* API-specific implementation of initializing the cipher. The
* {@link #isEncrypting()} function will tell whether it should be
Expand Down
10 changes: 1 addition & 9 deletions common/src/main/java/org/conscrypt/OpenSSLCipherChaCha20.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@

package org.conscrypt;

import static org.conscrypt.metrics.MetricsAlgorithm.CIPHER;
import static org.conscrypt.metrics.MetricsCipher.CHACHA20;
import static org.conscrypt.metrics.MetricsMode.NO_MODE;
import static org.conscrypt.metrics.MetricsPadding.NO_PADDING;

import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
Expand Down Expand Up @@ -49,10 +44,7 @@ public class OpenSSLCipherChaCha20 extends OpenSSLCipher {
private int currentBlockConsumedBytes = 0;
private int blockCounter = 0;

public OpenSSLCipherChaCha20() {
Platform.getStatsLog().countServiceUsage(
CIPHER.getId(), CHACHA20.getId(), NO_MODE.getId(), NO_PADDING.getId());
}
public OpenSSLCipherChaCha20() {}

@Override
void engineInitInternal(byte[] encodedKey, AlgorithmParameterSpec params, SecureRandom random)
Expand Down
41 changes: 11 additions & 30 deletions common/src/main/java/org/conscrypt/OpenSSLCipherRSA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,6 @@

package org.conscrypt;

import static org.conscrypt.metrics.MetricsAlgorithm.CIPHER;
import static org.conscrypt.metrics.MetricsCipher.RSA;
import static org.conscrypt.metrics.MetricsMode.NO_MODE;
import static org.conscrypt.metrics.MetricsPadding.NO_PADDING;
import static org.conscrypt.metrics.MetricsPadding.OAEP_SHA1;
import static org.conscrypt.metrics.MetricsPadding.OAEP_SHA224;
import static org.conscrypt.metrics.MetricsPadding.OAEP_SHA256;
import static org.conscrypt.metrics.MetricsPadding.OAEP_SHA384;
import static org.conscrypt.metrics.MetricsPadding.OAEP_SHA512;
import static org.conscrypt.metrics.MetricsPadding.PKCS1;

import java.security.AlgorithmParameters;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidKeyException;
Expand Down Expand Up @@ -98,10 +87,8 @@ public abstract class OpenSSLCipherRSA extends CipherSpi {
*/
int padding = NativeConstants.RSA_PKCS1_PADDING;

OpenSSLCipherRSA(int padding, int paddingId) {
OpenSSLCipherRSA(int padding) {
this.padding = padding;
Platform.getStatsLog().countServiceUsage(
CIPHER.getId(), RSA.getId(), NO_MODE.getId(), paddingId);
}

@Override
Expand Down Expand Up @@ -389,8 +376,8 @@ protected Key engineUnwrap(byte[] wrappedKey, String wrappedKeyAlgorithm,
}

public abstract static class DirectRSA extends OpenSSLCipherRSA {
protected DirectRSA(int padding, int paddingId) {
super(padding, paddingId);
protected DirectRSA(int padding) {
super(padding);
}

@Override
Expand Down Expand Up @@ -426,13 +413,13 @@ int doCryptoOperation(final byte[] tmpBuf, byte[] output)

public static final class PKCS1 extends DirectRSA {
public PKCS1() {
super(NativeConstants.RSA_PKCS1_PADDING, PKCS1.getId());
super(NativeConstants.RSA_PKCS1_PADDING);
}
}

public static final class Raw extends DirectRSA {
public Raw() {
super(NativeConstants.RSA_NO_PADDING, NO_PADDING.getId());
super(NativeConstants.RSA_NO_PADDING);
}
}

Expand All @@ -447,13 +434,7 @@ public static class OAEP extends OpenSSLCipherRSA {
private NativeRef.EVP_PKEY_CTX pkeyCtx;

public OAEP(long defaultMd, int defaultMdSizeBytes) {
super(NativeConstants.RSA_PKCS1_OAEP_PADDING, OAEP_SHA1.getId());
oaepMd = mgf1Md = defaultMd;
oaepMdSizeBytes = defaultMdSizeBytes;
}

private OAEP(long defaultMd, int defaultMdSizeBytes, int paddingId) {
super(NativeConstants.RSA_PKCS1_OAEP_PADDING, paddingId);
super(NativeConstants.RSA_PKCS1_OAEP_PADDING);
oaepMd = mgf1Md = defaultMd;
oaepMdSizeBytes = defaultMdSizeBytes;
}
Expand Down Expand Up @@ -617,31 +598,31 @@ int doCryptoOperation(byte[] tmpBuf, byte[] output)

public static final class SHA1 extends OAEP {
public SHA1() {
super(EvpMdRef.SHA1.EVP_MD, EvpMdRef.SHA1.SIZE_BYTES, OAEP_SHA1.getId());
super(EvpMdRef.SHA1.EVP_MD, EvpMdRef.SHA1.SIZE_BYTES);
}
}

public static final class SHA224 extends OAEP {
public SHA224() {
super(EvpMdRef.SHA224.EVP_MD, EvpMdRef.SHA224.SIZE_BYTES, OAEP_SHA224.getId());
super(EvpMdRef.SHA224.EVP_MD, EvpMdRef.SHA224.SIZE_BYTES);
}
}

public static final class SHA256 extends OAEP {
public SHA256() {
super(EvpMdRef.SHA256.EVP_MD, EvpMdRef.SHA256.SIZE_BYTES, OAEP_SHA256.getId());
super(EvpMdRef.SHA256.EVP_MD, EvpMdRef.SHA256.SIZE_BYTES);
}
}

public static final class SHA384 extends OAEP {
public SHA384() {
super(EvpMdRef.SHA384.EVP_MD, EvpMdRef.SHA384.SIZE_BYTES, OAEP_SHA384.getId());
super(EvpMdRef.SHA384.EVP_MD, EvpMdRef.SHA384.SIZE_BYTES);
}
}

public static final class SHA512 extends OAEP {
public SHA512() {
super(EvpMdRef.SHA512.EVP_MD, EvpMdRef.SHA512.SIZE_BYTES, OAEP_SHA512.getId());
super(EvpMdRef.SHA512.EVP_MD, EvpMdRef.SHA512.SIZE_BYTES);
}
}
}
Expand Down
5 changes: 2 additions & 3 deletions common/src/main/java/org/conscrypt/OpenSSLEvpCipher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,8 @@ public abstract class OpenSSLEvpCipher extends OpenSSLCipher {
*/
private int modeBlockSize;

protected OpenSSLEvpCipher(
Mode mode, Padding padding, int cipherId, int modeId, int paddingId) {
super(mode, padding, cipherId, modeId, paddingId);
protected OpenSSLEvpCipher(Mode mode, Padding padding) {
super(mode, padding);
}

@Override
Expand Down
Loading