get rid of EVP_PKEY_ECDSA (now we have EVP_PKEY_EC instead)

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

diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c
index 992cd48..8eaf102 100644 (file)
--- a/crypto/x509/x509type.c
+++ b/crypto/x509/x509type.c
@@ -58,9 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
 
 #include <stdio.h>
 #include "cryptlib.h"

-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>

 
 int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
        {
 
 int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
        {


@@ -86,6 +86,9 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
        case EVP_PKEY_DSA:
                ret=EVP_PK_DSA|EVP_PKT_SIGN;
                break;
        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;
        case EVP_PKEY_DH:
                ret=EVP_PK_DH|EVP_PKT_EXCH;
                break;


@@ -102,6 +105,9 @@ int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
        case EVP_PKS_DSA:
                ret|=EVP_PKS_DSA;
                break;
        case EVP_PKS_DSA:
                ret|=EVP_PKS_DSA;
                break;

+       case EVP_PKS_EC:
+               ret|=EVP_PKS_EC;
+               break;

        default:
                break;
                }
        default:
                break;
                }