Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / boringssl / src / crypto / x509 / x509_cmp.c

diff --git a/src/third_party/boringssl/src/crypto/x509/x509_cmp.c b/src/third_party/boringssl/src/crypto/x509/x509_cmp.c
index 57e6167..0974ef6 100644 (file)
--- a/src/third_party/boringssl/src/crypto/x509/x509_cmp.c
+++ b/src/third_party/boringssl/src/crypto/x509/x509_cmp.c
@@ -78,7 +78,6 @@ int X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
        return(X509_NAME_cmp(ai->issuer,bi->issuer));
        }
 
-#ifndef OPENSSL_NO_MD5
 unsigned long X509_issuer_and_serial_hash(X509 *a)
        {
        unsigned long ret=0;
@@ -105,7 +104,6 @@ unsigned long X509_issuer_and_serial_hash(X509 *a)
        EVP_MD_CTX_cleanup(&ctx);
        return(ret);
        }
-#endif
        
 int X509_issuer_name_cmp(const X509 *a, const X509 *b)
        {
@@ -122,12 +120,10 @@ int X509_CRL_cmp(const X509_CRL *a, const X509_CRL *b)
        return(X509_NAME_cmp(a->crl->issuer,b->crl->issuer));
        }
 
-#ifndef OPENSSL_NO_SHA
 int X509_CRL_match(const X509_CRL *a, const X509_CRL *b)
        {
        return memcmp(a->sha1_hash, b->sha1_hash, 20);
        }
-#endif
 
 X509_NAME *X509_get_issuer_name(X509 *a)
        {
@@ -139,12 +135,10 @@ unsigned long X509_issuer_name_hash(X509 *x)
        return(X509_NAME_hash(x->cert_info->issuer));
        }
 
-#ifndef OPENSSL_NO_MD5
 unsigned long X509_issuer_name_hash_old(X509 *x)
        {
        return(X509_NAME_hash_old(x->cert_info->issuer));
        }
-#endif
 
 X509_NAME *X509_get_subject_name(X509 *a)
        {
@@ -161,14 +155,11 @@ unsigned long X509_subject_name_hash(X509 *x)
        return(X509_NAME_hash(x->cert_info->subject));
        }
 
-#ifndef OPENSSL_NO_MD5
 unsigned long X509_subject_name_hash_old(X509 *x)
        {
        return(X509_NAME_hash_old(x->cert_info->subject));
        }
-#endif
 
-#ifndef OPENSSL_NO_SHA
 /* Compare two certificates: they must be identical for
  * this to work. NB: Although "cmp" operations are generally
  * prototyped to take "const" arguments (eg. for use in
@@ -199,7 +190,6 @@ int X509_cmp(const X509 *a, const X509 *b)
                }
        return rv;
 }
-#endif
 
 
 int X509_NAME_cmp(const X509_NAME *a, const X509_NAME *b)
@@ -249,7 +239,6 @@ unsigned long X509_NAME_hash(X509_NAME *x)
        }
 
 
-#ifndef OPENSSL_NO_MD5
 /* I now DER encode the name and hash it.  Since I cache the DER encoding,
  * this is reasonably efficient. */
 
@@ -273,7 +262,6 @@ unsigned long X509_NAME_hash_old(X509_NAME *x)
 
        return(ret);
        }
-#endif
 
 /* Search a stack of X509 for a match */
 X509 *X509_find_by_issuer_and_serial(STACK_OF(X509) *sk, X509_NAME *name,
@@ -364,7 +352,6 @@ int X509_check_private_key(X509 *x, EVP_PKEY *k)
  * flags.
  */
 
-#ifndef OPENSSL_NO_EC
 
 static int check_suite_b(EVP_PKEY *pkey, int sign_nid, unsigned long *pflags)
        {
@@ -484,19 +471,6 @@ int X509_CRL_check_suiteb(X509_CRL *crl, EVP_PKEY *pk, unsigned long flags)
        return check_suite_b(pk, sign_nid, &flags);
        }
 
-#else
-int X509_chain_check_suiteb(int *perror_depth, X509 *x, STACK_OF(X509) *chain,
-                                                       unsigned long flags)
-       {
-       return 0;
-       }
-
-int X509_CRL_check_suiteb(X509_CRL *crl, EVP_PKEY *pk, unsigned long flags)
-       {
-       return 0;
-       }
-
-#endif
 /* Not strictly speaking an "up_ref" as a STACK doesn't have a reference
  * count but it has the same effect by duping the STACK and upping the ref
  * of each X509 structure.