Rename functions for new convention.

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

diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 899b00eb1346cf3f45d37a164938a912b2238a68..a8a5ca8b03e61bf4defff035117b96d6e67f06b8 100644 (file)
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -57,12 +57,11 @@
  */
 
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include "cryptlib.h"
-#include "asn1.h"
-#include "objects.h"
-#include "x509.h"
+#include <openssl/asn1.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
 
 int X509_issuer_and_serial_cmp(X509 *a, X509 *b)
        {
@@ -71,7 +70,7 @@ int X509_issuer_and_serial_cmp(X509 *a, X509 *b)
 
        ai=a->cert_info;
        bi=b->cert_info;
-       i=ASN1_INTEGER_cmp(ai->serialNumber,bi->serialNumber);
+       i=M_ASN1_INTEGER_cmp(ai->serialNumber,bi->serialNumber);
        if (i) return(i);
        return(X509_NAME_cmp(ai->issuer,bi->issuer));
        }
@@ -138,17 +137,33 @@ unsigned long X509_subject_name_hash(X509 *x)
        return(X509_NAME_hash(x->cert_info->subject));
        }
 
+#ifndef NO_SHA
+/* Compare two certificates: they must be identical for
+ * this to work.
+ */
+int X509_cmp(X509 *a, X509 *b)
+{
+       /* ensure hash is valid */
+       X509_check_purpose(a, -1, 0);
+       X509_check_purpose(b, -1, 0);
+
+       return memcmp(a->sha1_hash, b->sha1_hash, SHA_DIGEST_LENGTH);
+}
+#endif
+
 int X509_NAME_cmp(X509_NAME *a, X509_NAME *b)
        {
        int i,j;
        X509_NAME_ENTRY *na,*nb;
 
-       if (sk_num(a->entries) != sk_num(b->entries))
-               return(sk_num(a->entries)-sk_num(b->entries));
-       for (i=sk_num(a->entries)-1; i>=0; i--)
+       if (sk_X509_NAME_ENTRY_num(a->entries)
+           != sk_X509_NAME_ENTRY_num(b->entries))
+               return sk_X509_NAME_ENTRY_num(a->entries)
+                 -sk_X509_NAME_ENTRY_num(b->entries);
+       for (i=sk_X509_NAME_ENTRY_num(a->entries)-1; i>=0; i--)
                {
-               na=(X509_NAME_ENTRY *)sk_value(a->entries,i);
-               nb=(X509_NAME_ENTRY *)sk_value(b->entries,i);
+               na=sk_X509_NAME_ENTRY_value(a->entries,i);
+               nb=sk_X509_NAME_ENTRY_value(b->entries,i);
                j=na->value->length-nb->value->length;
                if (j) return(j);
                j=memcmp(na->value->data,nb->value->data,
@@ -161,10 +176,10 @@ int X509_NAME_cmp(X509_NAME *a, X509_NAME *b)
        /* We will check the object types after checking the values
         * since the values will more often be different than the object
         * types. */
-       for (i=sk_num(a->entries)-1; i>=0; i--)
+       for (i=sk_X509_NAME_ENTRY_num(a->entries)-1; i>=0; i--)
                {
-               na=(X509_NAME_ENTRY *)sk_value(a->entries,i);
-               nb=(X509_NAME_ENTRY *)sk_value(b->entries,i);
+               na=sk_X509_NAME_ENTRY_value(a->entries,i);
+               nb=sk_X509_NAME_ENTRY_value(b->entries,i);
                j=OBJ_cmp(na->object,nb->object);
                if (j) return(j);
                }
@@ -173,7 +188,7 @@ int X509_NAME_cmp(X509_NAME *a, X509_NAME *b)
 
 #ifndef NO_MD5
 /* I now DER encode the name and hash it.  Since I cache the DER encoding,
- * this is reasonably effiecent. */
+ * this is reasonably efficient. */
 unsigned long X509_NAME_hash(X509_NAME *x)
        {
        unsigned long ret=0;
@@ -207,6 +222,8 @@ X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name,
        X509_CINF cinf;
        X509 x,*x509=NULL;
 
+       if(!sk) return NULL;
+
        x.cert_info= &cinf;
        cinf.serialNumber=serial;
        cinf.issuer=name;
@@ -249,7 +266,7 @@ int X509_check_private_key(X509 *x, EVP_PKEY *k)
        xk=X509_get_pubkey(x);
        if (xk->type != k->type)
            {
-           SSLerr(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_TYPE_MISMATCH);
+           X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_TYPE_MISMATCH);
            goto err;
            }
        switch (k->type)
@@ -259,7 +276,7 @@ int X509_check_private_key(X509 *x, EVP_PKEY *k)
                if (BN_cmp(xk->pkey.rsa->n,k->pkey.rsa->n) != 0
                    || BN_cmp(xk->pkey.rsa->e,k->pkey.rsa->e) != 0)
                    {
-                   SSLerr(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_VALUES_MISMATCH);
+                   X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_VALUES_MISMATCH);
                    goto err;
                    }
                break;
@@ -268,7 +285,7 @@ int X509_check_private_key(X509 *x, EVP_PKEY *k)
        case EVP_PKEY_DSA:
                if (BN_cmp(xk->pkey.dsa->pub_key,k->pkey.dsa->pub_key) != 0)
                    {
-                   SSLerr(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_VALUES_MISMATCH);
+                   X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_KEY_VALUES_MISMATCH);
                    goto err;
                    }
                break;
@@ -276,11 +293,11 @@ int X509_check_private_key(X509 *x, EVP_PKEY *k)
 #ifndef NO_DH
        case EVP_PKEY_DH:
                /* No idea */
-               SSLerr(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_CANT_CHECK_DH_KEY);
+               X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_CANT_CHECK_DH_KEY);
                goto err;
 #endif
        default:
-               SSLerr(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_UNKNOWN_KEY_TYPE);
+               X509err(X509_F_X509_CHECK_PRIVATE_KEY,X509_R_UNKNOWN_KEY_TYPE);
                goto err;
                }