? crypto/aes/aes-armv4.S

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

diff --git a/crypto/x509/x509type.c b/crypto/x509/x509type.c
index 42c23bcfca0bc0d989ad09524325c6f94e5b79ec..9702ec53103fc6c04ba154603a5ff5eb2a7aa573 100644 (file)
--- a/crypto/x509/x509type.c
+++ b/crypto/x509/x509type.c
@@ -58,13 +58,11 @@
 
 #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(x,pkey)
-X509 *x;
-EVP_PKEY *pkey;
+int X509_certificate_type(X509 *x, EVP_PKEY *pkey)
        {
        EVP_PKEY *pk;
        int ret=0,i;
@@ -88,28 +86,46 @@ 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;  
+       case NID_id_GostR3410_94:
+       case NID_id_GostR3410_2001:
+               ret=EVP_PKT_EXCH|EVP_PKT_SIGN;
                break;
        default:
                break;
                }
 
-       i=X509_get_signature_type(x);
-       switch (i)
+       i=OBJ_obj2nid(x->sig_alg->algorithm);
+       if (i && OBJ_find_sigid_algs(i, NULL, &i))
                {
-       case EVP_PKEY_RSA:
-               ret|=EVP_PKS_RSA;
-               break;
-       case EVP_PKS_DSA:
-               ret|=EVP_PKS_DSA;
-               break;
-       default:
-               break;
+
+               switch (i)
+                       {
+               case NID_rsaEncryption:
+               case NID_rsa:
+                       ret|=EVP_PKS_RSA;
+                       break;
+               case NID_dsa:
+               case NID_dsa_2:
+                       ret|=EVP_PKS_DSA;
+                       break;
+               case NID_X9_62_id_ecPublicKey:
+                       ret|=EVP_PKS_EC;
+                       break;
+               default:
+                       break;
+                       }
                }
 
-       if (EVP_PKEY_size(pkey) <= 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);
        }