Fix (most) WIN32 warnings and errors.

[openssl.git] / crypto / evp / pmeth_lib.c

diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c
index 3c923b7a73a1842b69e354ec55b83068c9e2cef0..80a130fbbf1b59dd038b74078654bf1dd63f62da 100644 (file)
--- a/crypto/evp/pmeth_lib.c
+++ b/crypto/evp/pmeth_lib.c
@@ -58,8 +58,8 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <openssl/objects.h>
 #include "cryptlib.h"
+#include <openssl/objects.h>
 #include <openssl/evp.h>
 #include "asn1_locl.h"
 #include "evp_locl.h"
@@ -67,13 +67,14 @@
 typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
 STACK *app_pkey_methods = NULL;
 
-extern EVP_PKEY_METHOD rsa_pkey_meth, dh_pkey_meth, dsa_pkey_meth;
+extern EVP_PKEY_METHOD rsa_pkey_meth, dh_pkey_meth, dsa_pkey_meth, ec_pkey_meth;
 
 static const EVP_PKEY_METHOD *standard_methods[] =
        {
        &rsa_pkey_meth,
        &dh_pkey_meth,
-       &dsa_pkey_meth
+       &dsa_pkey_meth,
+       &ec_pkey_meth
        };
 
 static int pmeth_cmp(const EVP_PKEY_METHOD * const *a,
@@ -146,7 +147,7 @@ EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags)
                return NULL;
 
        pmeth->pkey_id = id;
-       pmeth->flags = flags | EVP_PKEY_DYNAMIC;
+       pmeth->flags = flags | EVP_PKEY_FLAG_DYNAMIC;
 
        pmeth->init = 0;
        pmeth->cleanup = 0;
@@ -178,7 +179,7 @@ EVP_PKEY_METHOD* EVP_PKEY_meth_new(int id, int flags)
 
 void EVP_PKEY_meth_free(EVP_PKEY_METHOD *pmeth)
        {
-       if (pmeth && (pmeth->flags & EVP_PKEY_DYNAMIC))
+       if (pmeth && (pmeth->flags & EVP_PKEY_FLAG_DYNAMIC))
                OPENSSL_free(pmeth);
        }