Stop compiler warnings.

[oweals/openssl.git] / crypto / x509 / x509type.c

diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c
index 8eaf102480ca058ce6413eac6ed71be1fb999e56..c25959a74282866ee469a32a47eb6bca5b788ece 100644 (file)
--- a/crypto/x509/x509type.c
+++ b/crypto/x509/x509type.c
@@ -86,9 +86,6 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
        case EVP_PKEY_DSA:
                ret=EVP_PK_DSA|EVP_PKT_SIGN;
                break;
-       case EVP_PKEY_EC:
-               ret=EVP_PK_EC|EVP_PKT_SIGN|EVP_PKT_EXCH;
-               break;
        case EVP_PKEY_DH:
                ret=EVP_PK_DH|EVP_PKT_EXCH;
                break;
@@ -102,17 +99,15 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
        case EVP_PKEY_RSA:
                ret|=EVP_PKS_RSA;
                break;
-       case EVP_PKS_DSA:
+       case EVP_PKEY_DSA:
                ret|=EVP_PKS_DSA;
                break;
-       case EVP_PKS_EC:
-               ret|=EVP_PKS_EC;
-               break;
        default:
                break;
                }
 
-       if (EVP_PKEY_size(pk) <= 512)
+       if (EVP_PKEY_size(pk) <= 1024/8)/* /8 because it's 1024 bits we look
+                                          for, not bytes */
                ret|=EVP_PKT_EXP;
        if(pkey==NULL) EVP_PKEY_free(pk);
        return(ret);