make update (libeay.num has been edited to match 0.9.7-stable)

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

diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 1334ff631cf1fa7b7ff47c45c892adf4ea79162b..dbbe0a9236721eb663cb5cfac7daf77df296f392 100644 (file)
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -83,16 +83,18 @@ unsigned long X509_issuer_and_serial_hash(X509 *a)
        unsigned char md[16];
        char str[256];
 
+       EVP_MD_CTX_init(&ctx);
        X509_NAME_oneline(a->cert_info->issuer,str,256);
        ret=strlen(str);
-       EVP_DigestInit(&ctx,EVP_md5());
+       EVP_DigestInit_ex(&ctx, EVP_md5(), NULL);
        EVP_DigestUpdate(&ctx,(unsigned char *)str,ret);
        EVP_DigestUpdate(&ctx,(unsigned char *)a->cert_info->serialNumber->data,
                (unsigned long)a->cert_info->serialNumber->length);
-       EVP_DigestFinal(&ctx,&(md[0]),NULL);
+       EVP_DigestFinal_ex(&ctx,&(md[0]),NULL);
        ret=(   ((unsigned long)md[0]     )|((unsigned long)md[1]<<8L)|
                ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L)
                )&0xffffffffL;
+       EVP_MD_CTX_cleanup(&ctx);
        return(ret);
        }
 #endif
@@ -202,7 +204,7 @@ unsigned long X509_NAME_hash(X509_NAME *x)
 
        /* Make sure X509_NAME structure contains valid cached encoding */
        i2d_X509_NAME(x,NULL);
-       EVP_Digest(x->bytes->data, x->bytes->length, md, NULL, EVP_md5());
+       EVP_Digest(x->bytes->data, x->bytes->length, md, NULL, EVP_md5(), NULL);
 
        ret=(   ((unsigned long)md[0]     )|((unsigned long)md[1]<<8L)|
                ((unsigned long)md[2]<<16L)|((unsigned long)md[3]<<24L)
@@ -293,6 +295,22 @@ int X509_check_private_key(X509 *x, EVP_PKEY *k)
                    }
                break;
 #endif
+#ifndef OPENSSL_NO_ECDSA
+       case EVP_PKEY_ECDSA:
+               {
+               int  r = EC_POINT_cmp(xk->pkey.ecdsa->group,xk->pkey.ecdsa->pub_key,k->pkey.ecdsa->pub_key,NULL);
+               if (r != 0)
+                       {
+                       if (r == 1)
+                               X509err(X509_F_X509_CHECK_PRIVATE_KEY, X509_R_KEY_VALUES_MISMATCH);
+                       else
+                               X509err(X509_F_X509_CHECK_PRIVATE_KEY, ERR_R_EC_LIB);
+                       
+                       goto err;
+                       }
+               }
+               break;
+#endif
 #ifndef OPENSSL_NO_DH
        case EVP_PKEY_DH:
                /* No idea */