diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-01-19 00:21:12 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-20 03:24:59 +0000 |
| commit | 3aeb93486588e7dd01379c50b8fd496d55cf8858 (patch) | |
| tree | e5d5793ef4786dbfac5c724e8235a3aa1ce323b2 /crypto/x509 | |
| parent | a8eda4312db1f98cffda38670e2d40d36566785a (diff) | |
make EVP_PKEY opaque
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509_cmp.c | 4 | ||||
| -rw-r--r-- | crypto/x509/x509_req.c | 4 | ||||
| -rw-r--r-- | crypto/x509/x509type.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c index 20834a079f..2521e77b2a 100644 --- a/crypto/x509/x509_cmp.c +++ b/crypto/x509/x509_cmp.c @@ -367,8 +367,8 @@ static int check_suite_b(EVP_PKEY *pkey, int sign_nid, unsigned long *pflags) { const EC_GROUP *grp = NULL; int curve_nid; - if (pkey && pkey->type == EVP_PKEY_EC) - grp = EC_KEY_get0_group(pkey->pkey.ec); + if (pkey && EVP_PKEY_id(pkey) == EVP_PKEY_EC) + grp = EC_KEY_get0_group(EVP_PKEY_get0_EC_KEY(pkey)); if (!grp) return X509_V_ERR_SUITE_B_INVALID_ALGORITHM; curve_nid = EC_GROUP_get_curve_name(grp); diff --git a/crypto/x509/x509_req.c b/crypto/x509/x509_req.c index b27f9f6010..8e60f84f88 100644 --- a/crypto/x509/x509_req.c +++ b/crypto/x509/x509_req.c @@ -140,13 +140,13 @@ int X509_REQ_check_private_key(X509_REQ *x, EVP_PKEY *k) break; case -2: #ifndef OPENSSL_NO_EC - if (k->type == EVP_PKEY_EC) { + if (EVP_PKEY_id(k) == EVP_PKEY_EC) { X509err(X509_F_X509_REQ_CHECK_PRIVATE_KEY, ERR_R_EC_LIB); break; } #endif #ifndef OPENSSL_NO_DH - if (k->type == EVP_PKEY_DH) { + if (EVP_PKEY_id(k) == EVP_PKEY_DH) { /* No idea */ X509err(X509_F_X509_REQ_CHECK_PRIVATE_KEY, X509_R_CANT_CHECK_DH_KEY); diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c index a9116e7c77..07e5141f14 100644 --- a/crypto/x509/x509type.c +++ b/crypto/x509/x509type.c @@ -78,7 +78,7 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey) if (pk == NULL) return (0); - switch (pk->type) { + switch (EVP_PKEY_id(pk)) { case EVP_PKEY_RSA: ret = EVP_PK_RSA | EVP_PKT_SIGN; /* if (!sign only extension) */ |