Override and so delegate all methods in OpenSslX509Certificate (#8472)
Motivation: We did not override all methods in OpenSslX509Certificate and delegate to the internal 509Certificate. Modifications: Add missing overrides. Result: More correct implementation
This commit is contained in:
parent
28f9136824
commit
fd57d971d1
@ -15,20 +15,25 @@
|
|||||||
*/
|
*/
|
||||||
package io.netty.handler.ssl;
|
package io.netty.handler.ssl;
|
||||||
|
|
||||||
|
import javax.security.auth.x500.X500Principal;
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
import java.security.InvalidKeyException;
|
import java.security.InvalidKeyException;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
import java.security.NoSuchProviderException;
|
import java.security.NoSuchProviderException;
|
||||||
import java.security.Principal;
|
import java.security.Principal;
|
||||||
|
import java.security.Provider;
|
||||||
import java.security.PublicKey;
|
import java.security.PublicKey;
|
||||||
import java.security.SignatureException;
|
import java.security.SignatureException;
|
||||||
import java.security.cert.CertificateEncodingException;
|
import java.security.cert.CertificateEncodingException;
|
||||||
import java.security.cert.CertificateException;
|
import java.security.cert.CertificateException;
|
||||||
import java.security.cert.CertificateExpiredException;
|
import java.security.cert.CertificateExpiredException;
|
||||||
import java.security.cert.CertificateNotYetValidException;
|
import java.security.cert.CertificateNotYetValidException;
|
||||||
|
import java.security.cert.CertificateParsingException;
|
||||||
import java.security.cert.X509Certificate;
|
import java.security.cert.X509Certificate;
|
||||||
|
import java.util.Collection;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
final class OpenSslX509Certificate extends X509Certificate {
|
final class OpenSslX509Certificate extends X509Certificate {
|
||||||
@ -50,6 +55,37 @@ final class OpenSslX509Certificate extends X509Certificate {
|
|||||||
unwrap().checkValidity(date);
|
unwrap().checkValidity(date);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public X500Principal getIssuerX500Principal() {
|
||||||
|
return unwrap().getIssuerX500Principal();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public X500Principal getSubjectX500Principal() {
|
||||||
|
return unwrap().getSubjectX500Principal();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<String> getExtendedKeyUsage() throws CertificateParsingException {
|
||||||
|
return unwrap().getExtendedKeyUsage();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Collection<List<?>> getSubjectAlternativeNames() throws CertificateParsingException {
|
||||||
|
return unwrap().getSubjectAlternativeNames();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Collection<List<?>> getIssuerAlternativeNames() throws CertificateParsingException {
|
||||||
|
return unwrap().getSubjectAlternativeNames();
|
||||||
|
}
|
||||||
|
|
||||||
|
// No @Override annotation as it was only introduced in Java8.
|
||||||
|
public void verify(PublicKey key, Provider sigProvider)
|
||||||
|
throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, SignatureException {
|
||||||
|
unwrap().verify(key, sigProvider);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getVersion() {
|
public int getVersion() {
|
||||||
return unwrap().getVersion();
|
return unwrap().getVersion();
|
||||||
|
1
pom.xml
1
pom.xml
@ -777,6 +777,7 @@
|
|||||||
<!-- JDK 8 -->
|
<!-- JDK 8 -->
|
||||||
<ignore>java.util.concurrent.atomic.LongAdder</ignore>
|
<ignore>java.util.concurrent.atomic.LongAdder</ignore>
|
||||||
<ignore>java.util.function.BiFunction</ignore>
|
<ignore>java.util.function.BiFunction</ignore>
|
||||||
|
<ignore>java.security.cert.X509Certificate</ignore>
|
||||||
|
|
||||||
<!-- Resolver -->
|
<!-- Resolver -->
|
||||||
<ignore>java.net.InetAddress</ignore>
|
<ignore>java.net.InetAddress</ignore>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user