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

TKSS-812: Cleanup TLCP codes #813

Merged
merged 1 commit into from
Jul 4, 2024
Merged

TKSS-812: Cleanup TLCP codes #813

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
2 changes: 1 addition & 1 deletion kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/TLCPAuthentication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public Map.Entry<Byte, HandshakeProducer>[] getHandshakeProducers(
});
} // Otherwise, SSL/TLS does not use this method.

return new Map.Entry[0];
return (Map.Entry<Byte, HandshakeProducer>[])(new Map.Entry[0]);
}

static final class TLCPPossession implements SSLPossession {
Expand Down
11 changes: 6 additions & 5 deletions kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/TLCPCertificate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.nio.ByteBuffer;
import java.security.PublicKey;
import java.security.cert.CertPathValidatorException;
import java.security.cert.CertPathValidatorException.BasicReason;
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
Expand Down Expand Up @@ -823,16 +824,16 @@ private static Alert getCertificateAlert(
Alert.BAD_CERT_STATUS_RESPONSE :
Alert.CERTIFICATE_REVOKED;
} else if (
reason == CertPathValidatorException.BasicReason.UNDETERMINED_REVOCATION_STATUS) {
reason == BasicReason.UNDETERMINED_REVOCATION_STATUS) {
alert = chc.staplingActive ?
Alert.BAD_CERT_STATUS_RESPONSE :
Alert.CERTIFICATE_UNKNOWN;
} else if (reason == CertPathValidatorException.BasicReason.ALGORITHM_CONSTRAINED) {
} else if (reason == BasicReason.ALGORITHM_CONSTRAINED) {
alert = Alert.UNSUPPORTED_CERTIFICATE;
} else if (reason == CertPathValidatorException.BasicReason.EXPIRED) {
} else if (reason == BasicReason.EXPIRED) {
alert = Alert.CERTIFICATE_EXPIRED;
} else if (reason == CertPathValidatorException.BasicReason.INVALID_SIGNATURE ||
reason == CertPathValidatorException.BasicReason.NOT_YET_VALID) {
} else if (reason == BasicReason.INVALID_SIGNATURE ||
reason == BasicReason.NOT_YET_VALID) {
alert = Alert.BAD_CERTIFICATE;
}
}
Expand Down
76 changes: 42 additions & 34 deletions kona-ssl/src/main/java/com/tencent/kona/sun/security/ssl/TLCPKeyAgreement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,32 +83,36 @@ public Map.Entry<Byte, HandshakeProducer>[] getHandshakeProducers(
if (handshakeContext.sslConfig.isClientMode) {
switch (this) {
case SM2:
return new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.CLIENT_KEY_EXCHANGE.id,
SM2ClientKeyExchange.sm2HandshakeProducer)};
return (Map.Entry<Byte,
HandshakeProducer>[]) new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.CLIENT_KEY_EXCHANGE.id,
SM2ClientKeyExchange.sm2HandshakeProducer)};
case SM2E:
return new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.CLIENT_KEY_EXCHANGE.id,
SM2EClientKeyExchange.sm2eHandshakeProducer)};
return (Map.Entry<Byte,
HandshakeProducer>[]) new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.CLIENT_KEY_EXCHANGE.id,
SM2EClientKeyExchange.sm2eHandshakeProducer)};
}
} else {
switch (this) {
case SM2:
return new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.SERVER_KEY_EXCHANGE.id,
SM2ServerKeyExchange.sm2HandshakeProducer)};
return (Map.Entry<Byte,
HandshakeProducer>[]) new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.SERVER_KEY_EXCHANGE.id,
SM2ServerKeyExchange.sm2HandshakeProducer)};
case SM2E:
return new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.SERVER_KEY_EXCHANGE.id,
SM2EServerKeyExchange.sm2eHandshakeProducer)};
return (Map.Entry<Byte,
HandshakeProducer>[]) new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.SERVER_KEY_EXCHANGE.id,
SM2EServerKeyExchange.sm2eHandshakeProducer)};
}
}

return new Map.Entry[0];
return (Map.Entry<Byte, HandshakeProducer>[]) (new Map.Entry[0]);
}

@Override
Expand All @@ -122,31 +126,35 @@ public Map.Entry<Byte, SSLConsumer>[] getHandshakeConsumers(
if (handshakeContext.sslConfig.isClientMode) {
switch (this) {
case SM2:
return new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.SERVER_KEY_EXCHANGE.id,
SM2ServerKeyExchange.sm2HandshakeConsumer)};
return (Map.Entry<Byte,
SSLConsumer>[]) new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.SERVER_KEY_EXCHANGE.id,
SM2ServerKeyExchange.sm2HandshakeConsumer)};
case SM2E:
return new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.SERVER_KEY_EXCHANGE.id,
SM2EServerKeyExchange.sm2eHandshakeConsumer)};
return (Map.Entry<Byte,
SSLConsumer>[]) new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.SERVER_KEY_EXCHANGE.id,
SM2EServerKeyExchange.sm2eHandshakeConsumer)};
}
} else {
switch (this) {
case SM2:
return new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.CLIENT_KEY_EXCHANGE.id,
SM2ClientKeyExchange.sm2HandshakeConsumer)};
return (Map.Entry<Byte,
SSLConsumer>[]) new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.CLIENT_KEY_EXCHANGE.id,
SM2ClientKeyExchange.sm2HandshakeConsumer)};
case SM2E:
return new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.CLIENT_KEY_EXCHANGE.id,
SM2EClientKeyExchange.sm2eHandshakeConsumer)};
return (Map.Entry<Byte,
SSLConsumer>[]) new Map.Entry[] {
new SimpleImmutableEntry<>(
SSLHandshake.CLIENT_KEY_EXCHANGE.id,
SM2EClientKeyExchange.sm2eHandshakeConsumer)};
}
}

return new Map.Entry[0];
return (Map.Entry<Byte, SSLConsumer>[])(new Map.Entry[0]);
}
}
Loading