Remove unused fields from EVP_PKEY.
None of these are ever set.
Change-Id: If92554a4c560bf8fa2d630c419a946711db30839
Reviewed-on: https://boringssl-review.googlesource.com/4114
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/evp/evp.c b/crypto/evp/evp.c
index ddcf0a4..49dbd79 100644
--- a/crypto/evp/evp.c
+++ b/crypto/evp/evp.c
@@ -109,12 +109,6 @@
}
free_it(pkey);
- if (pkey->attributes) {
- /* TODO(fork): layering: X509_ATTRIBUTE_free is an X.509 function. In
- * practice this path isn't called but should be removed in the future. */
- /*sk_X509_ATTRIBUTE_pop_free(pkey->attributes, X509_ATTRIBUTE_free);*/
- assert(0);
- }
OPENSSL_free(pkey);
}
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
index f82a711..58b00a5 100644
--- a/include/openssl/evp.h
+++ b/include/openssl/evp.h
@@ -677,9 +677,6 @@
* which element (if any) of the |pkey| union is valid. */
int type;
- /* TODO(fork): document */
- int save_type;
-
union {
char *ptr;
struct rsa_st *rsa; /* RSA */
@@ -688,16 +685,9 @@
struct ec_key_st *ec; /* ECC */
} pkey;
- ENGINE *engine;
-
- /* TODO(fork): document */
- int save_parameters;
/* ameth contains a pointer to a method table that contains many ASN.1
* methods for the key type. */
const EVP_PKEY_ASN1_METHOD *ameth;
-
- /* TODO(fork): document; */
- STACK_OF(X509_ATTRIBUTE) * attributes; /* [ 0 ] */
} /* EVP_PKEY */;