Remove pkey_ctrl.

It only included ASN1_PKEY_CTRL_DEFAULT_MD_NID and that's unused in
BoringSSL.

Change-Id: Idfcbd0f26f6448ce307c53ddef334f2e63c85a64

4 files changed, 1 insertions, 44 deletions

diff --git a/crypto/evp/internal.h b/crypto/evp/internal.h
index 0e9dfb21..ff310e96 100644
--- a/crypto/evp/internal.h
+++ b/crypto/evp/internal.h
@@ -121,7 +121,6 @@ struct evp_pkey_asn1_method_st {
 
 
   void (*pkey_free)(EVP_PKEY *pkey);
-  int (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2);
 
   /* Legacy functions for old PEM */
 
diff --git a/crypto/evp/p_ec_asn1.c b/crypto/evp/p_ec_asn1.c
index fe3ce0ea..a423fb88 100644
--- a/crypto/evp/p_ec_asn1.c
+++ b/crypto/evp/p_ec_asn1.c
@@ -538,17 +538,6 @@ static int old_ec_priv_encode(const EVP_PKEY *pkey, uint8_t **pder) {
   return i2d_ECPrivateKey(pkey->pkey.ec, pder);
 }
 
-static int ec_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) {
-  switch (op) {
-    case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
-      *(int *)arg2 = NID_sha1;
-      return 2;
-
-    default:
-      return -2;
-  }
-}
-
 const EVP_PKEY_ASN1_METHOD ec_asn1_meth = {
   EVP_PKEY_EC,
   EVP_PKEY_EC,
@@ -579,7 +568,6 @@ const EVP_PKEY_ASN1_METHOD ec_asn1_meth = {
   0,
 
   int_ec_free,
-  ec_pkey_ctrl,
   old_ec_priv_decode,
   old_ec_priv_encode
 };
diff --git a/crypto/evp/p_hmac_asn1.c b/crypto/evp/p_hmac_asn1.c
index 3d5e8017..06ba0e59 100644
--- a/crypto/evp/p_hmac_asn1.c
+++ b/crypto/evp/p_hmac_asn1.c
@@ -75,17 +75,6 @@ static void hmac_key_free(EVP_PKEY *pkey) {
   }
 }
 
-static int hmac_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) {
-  switch (op) {
-    case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
-      *(int *)arg2 = NID_sha1;
-      return 1;
-
-    default:
-      return -2;
-  }
-}
-
 const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = {
     EVP_PKEY_HMAC,       EVP_PKEY_HMAC,         0 /* flags */,
     "HMAC",              "OpenSSL HMAC method", 0 /* pub_decode */,
@@ -95,6 +84,6 @@ const EVP_PKEY_ASN1_METHOD hmac_asn1_meth = {
     hmac_size,           0 /* pkey_bits */,     0 /* param_decode */,
     0 /* param_encode*/, 0 /* param_missing*/,  0 /* param_copy*/,
     0 /* param_cmp*/,    0 /* param_print*/,    0 /* sig_print*/,
-    hmac_key_free,       hmac_pkey_ctrl,        0 /* old_priv_decode */,
+    hmac_key_free,       0 /* old_priv_decode */,
     0 /* old_priv_encode */
 };
diff --git a/crypto/evp/p_rsa_asn1.c b/crypto/evp/p_rsa_asn1.c
index 179d96b3..9c885125 100644
--- a/crypto/evp/p_rsa_asn1.c
+++ b/crypto/evp/p_rsa_asn1.c
@@ -409,24 +409,6 @@ static int rsa_sig_print(BIO *bp, const X509_ALGOR *sigalg,
   return 1;
 }
 
-static int rsa_pkey_ctrl(EVP_PKEY *pkey, int op, long arg1, void *arg2) {
-  X509_ALGOR *alg = NULL;
-  switch (op) {
-    case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
-      *(int *)arg2 = NID_sha1;
-      return 1;
-
-    default:
-      return -2;
-  }
-
-  if (alg) {
-    X509_ALGOR_set0(alg, OBJ_nid2obj(NID_rsaEncryption), V_ASN1_NULL, 0);
-  }
-
-  return 1;
-}
-
 static int old_rsa_priv_decode(EVP_PKEY *pkey, const unsigned char **pder,
                                int derlen) {
   RSA *rsa = d2i_RSAPrivateKey(NULL, pder, derlen);
@@ -709,7 +691,6 @@ const EVP_PKEY_ASN1_METHOD rsa_asn1_meth = {
 
   rsa_sig_print,
   int_rsa_free,
-  rsa_pkey_ctrl,
 
   old_rsa_priv_decode,
   old_rsa_priv_encode,