2 files changed, 3 insertions, 23 deletions
diff --git a/src/include/ipxe/tls.h b/src/include/ipxe/tls.h
index 804e1a1fb..a2504f19c 100644
--- a/src/include/ipxe/tls.h
+++ b/src/include/ipxe/tls.h
@@ -182,9 +182,6 @@ struct tls_session {
 	/** SHA256 context for handshake verification */
 	uint8_t handshake_sha256_ctx[SHA256_CTX_SIZE];
 
-	/** Hack: server RSA public key */
-	struct x509_rsa_public_key rsa;
-
 	/** TX sequence number */
 	uint64_t tx_seq;
 	/** TX pending transmissions */
diff --git a/src/include/ipxe/x509.h b/src/include/ipxe/x509.h
index 2ea21aa9c..f8cffabdb 100644
--- a/src/include/ipxe/x509.h
+++ b/src/include/ipxe/x509.h
@@ -11,31 +11,14 @@ FILE_LICENCE ( GPL2_OR_LATER );
 
 #include <stdint.h>
 #include <stdlib.h>
-
-struct asn1_cursor;
+#include <ipxe/asn1.h>
 
 /** An X.509 RSA public key */
 struct x509_rsa_public_key {
-	/** Modulus */
-	uint8_t *modulus;
-	/** Modulus length */
-	size_t modulus_len;
-	/** Exponent */
-	uint8_t *exponent;
-	/** Exponent length */
-	size_t exponent_len;
+	/** Raw public key */
+	struct asn1_cursor raw;
 };
 
-/**
- * Free X.509 RSA public key
- *
- * @v rsa_pubkey	RSA public key
- */
-static inline void
-x509_free_rsa_public_key ( struct x509_rsa_public_key *rsa_pubkey ) {
-	free ( rsa_pubkey->modulus );
-}
-
 extern int x509_rsa_public_key ( const struct asn1_cursor *certificate,
 				 struct x509_rsa_public_key *rsa_pubkey );