Skip to content
Snippets Groups Projects
Verified Commit c37accdd authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Replace deprecated certificate handling

parent fb168987
No related branches found
No related tags found
No related merge requests found
Pipeline #588 passed
......@@ -19,6 +19,7 @@
package de.kuschku.quasseldroid.util
import java.security.cert.Certificate
import java.security.cert.X509Certificate
import javax.net.ssl.SSLSession
......@@ -63,8 +64,7 @@ data class TlsInfo(
session.protocol,
cipherSuite,
keyExchangeMechanism,
session.peerCertificateChain
.map(javax.security.cert.X509Certificate::toJavaCertificate)
session.peerCertificates.map(Certificate::toX509)
)
}
}
......
......@@ -20,15 +20,12 @@
package de.kuschku.quasseldroid.util
import java.io.ByteArrayInputStream
import java.security.cert.Certificate
import java.security.cert.CertificateFactory
import java.security.cert.X509Certificate as javaCertificate
import javax.security.cert.X509Certificate as javaxCertificate
import java.security.cert.X509Certificate
private val certificateFactory = CertificateFactory.getInstance("X.509")
fun javaxCertificate.toJavaCertificate(): javaCertificate =
fun Certificate.toX509(): X509Certificate =
certificateFactory.generateCertificate(ByteArrayInputStream(this.encoded))
as javaCertificate
fun javaCertificate.toJavaXCertificate(): javaxCertificate =
javaxCertificate.getInstance(this.encoded)
as X509Certificate
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment