projects / openssl.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix for d2i_ASN1_bytes and stop PKCS#7 routines crashing is signed message
[openssl.git] / crypto / x509 / x509_cmp.c
diff --git a/crypto/x509/x509_cmp.c b/crypto/x509/x509_cmp.c
index 7d850184ca34cf21fdc0f27d9ac5c150a3bcf9a5..6213ec2f8d90acc7a66b80285fbb4032d6c02a28 100644 (file)
--- a/crypto/x509/x509_cmp.c
+++ b/crypto/x509/x509_cmp.c
@@ -57,16 +57,12 @@
  */
 
 #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>
 
-int X509_issuer_and_serial_cmp(a,b)
-X509 *a;
-X509 *b;
+int X509_issuer_and_serial_cmp(X509 *a, X509 *b)
        {
        int i;
        X509_CINF *ai,*bi;
@@ -79,8 +75,7 @@ X509 *b;
        }
 
 #ifndef NO_MD5
-unsigned long X509_issuer_and_serial_hash(a)
-X509 *a;
+unsigned long X509_issuer_and_serial_hash(X509 *a)
        {
        unsigned long ret=0;
        MD5_CTX ctx;
@@ -101,70 +96,59 @@ X509 *a;
        }
 #endif
        
-int X509_issuer_name_cmp(a, b)
-X509 *a;
-X509 *b;
+int X509_issuer_name_cmp(X509 *a, X509 *b)
        {
        return(X509_NAME_cmp(a->cert_info->issuer,b->cert_info->issuer));
        }
 
-int X509_subject_name_cmp(a, b)
-X509 *a;
-X509 *b;
+int X509_subject_name_cmp(X509 *a, X509 *b)
        {
        return(X509_NAME_cmp(a->cert_info->subject,b->cert_info->subject));
        }
 
-int X509_CRL_cmp(a, b)
-X509_CRL *a;
-X509_CRL *b;
+int X509_CRL_cmp(X509_CRL *a, X509_CRL *b)
        {
        return(X509_NAME_cmp(a->crl->issuer,b->crl->issuer));
        }
 
-X509_NAME *X509_get_issuer_name(a)
-X509 *a;
+X509_NAME *X509_get_issuer_name(X509 *a)
        {
        return(a->cert_info->issuer);
        }
 
-unsigned long X509_issuer_name_hash(x)
-X509 *x;
+unsigned long X509_issuer_name_hash(X509 *x)
        {
        return(X509_NAME_hash(x->cert_info->issuer));
        }
 
-X509_NAME *X509_get_subject_name(a)
-X509 *a;
+X509_NAME *X509_get_subject_name(X509 *a)
        {
        return(a->cert_info->subject);
        }
 
-ASN1_INTEGER *X509_get_serialNumber(a)
-X509 *a;
+ASN1_INTEGER *X509_get_serialNumber(X509 *a)
        {
        return(a->cert_info->serialNumber);
        }
 
-unsigned long X509_subject_name_hash(x)
-X509 *x;
+unsigned long X509_subject_name_hash(X509 *x)
        {
        return(X509_NAME_hash(x->cert_info->subject));
        }
 
-int X509_NAME_cmp(a, b)
-X509_NAME *a;
-X509_NAME *b;
+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,
@@ -177,10 +161,10 @@ 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);
                }
@@ -190,8 +174,7 @@ 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. */
-unsigned long X509_NAME_hash(x)
-X509_NAME *x;
+unsigned long X509_NAME_hash(X509_NAME *x)
        {
        unsigned long ret=0;
        unsigned char md[16];
@@ -217,55 +200,50 @@ X509_NAME *x;
 #endif
 
 /* Search a stack of X509 for a match */
-X509 *X509_find_by_issuer_and_serial(sk,name,serial)
-STACK *sk;
-X509_NAME *name;
-ASN1_INTEGER *serial;
+X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name,
+               ASN1_INTEGER *serial)
        {
        int i;
        X509_CINF cinf;
        X509 x,*x509=NULL;
 
+       if(!sk) return NULL;
+
        x.cert_info= &cinf;
        cinf.serialNumber=serial;
        cinf.issuer=name;
 
-       for (i=0; i<sk_num(sk); i++)
+       for (i=0; i<sk_X509_num(sk); i++)
                {
-               x509=(X509 *)sk_value(sk,i);
+               x509=sk_X509_value(sk,i);
                if (X509_issuer_and_serial_cmp(x509,&x) == 0)
                        return(x509);
                }
        return(NULL);
        }
 
-X509 *X509_find_by_subject(sk,name)
-STACK *sk;
-X509_NAME *name;
+X509 *X509_find_by_subject(STACK_OF(X509) *sk, X509_NAME *name)
        {
        X509 *x509;
        int i;
 
-       for (i=0; i<sk_num(sk); i++)
+       for (i=0; i<sk_X509_num(sk); i++)
                {
-               x509=(X509 *)sk_value(sk,i);
+               x509=sk_X509_value(sk,i);
                if (X509_NAME_cmp(X509_get_subject_name(x509),name) == 0)
                        return(x509);
                }
        return(NULL);
        }
 
-EVP_PKEY *X509_get_pubkey(x)
-X509 *x;
+EVP_PKEY *X509_get_pubkey(X509 *x)
        {
        if ((x == NULL) || (x->cert_info == NULL))
                return(NULL);
        return(X509_PUBKEY_get(x->cert_info->key));
        }
 
-int X509_check_private_key(x,k)
-X509 *x;
-EVP_PKEY *k;
+int X509_check_private_key(X509 *x, EVP_PKEY *k)
        {
        EVP_PKEY *xk=NULL;
        int ok=0;
@@ -273,7 +251,7 @@ 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)
@@ -283,7 +261,7 @@ 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;
@@ -292,7 +270,7 @@ 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;
@@ -300,11 +278,11 @@ 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;
                }
 
Unnamed repository; edit this file 'description' to name the repository.