Upgrade chrome's OpenSSL to same version Android ships with.

openssl/crypto/dsa/dsa_lib.c

 /* crypto/dsa/dsa_lib.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 58 matching lines @@
 #ifndef OPENSSL_NO_DH
 #include <openssl/dh.h>
 #endif
 
 const char DSA_version[]="DSA" OPENSSL_VERSION_PTEXT;
 
 static const DSA_METHOD *default_DSA_method = NULL;
 
 void DSA_set_default_method(const DSA_METHOD *meth)
         {
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(meth->flags & DSA_FLAG_FIPS_METHOD))
-                {
-                DSAerr(DSA_F_DSA_SET_DEFAULT_METHOD, DSA_R_NON_FIPS_METHOD);
-                return;
-                }
-#endif
-                
         default_DSA_method = meth;
         }
 
 const DSA_METHOD *DSA_get_default_method(void)
         {
         if(!default_DSA_method)
                 default_DSA_method = DSA_OpenSSL();
         return default_DSA_method;
         }
 
 DSA *DSA_new(void)
         {
         return DSA_new_method(NULL);
         }
 
 int DSA_set_method(DSA *dsa, const DSA_METHOD *meth)
         {
         /* NB: The caller is specifically setting a method, so it's not up to us
          * to deal with which ENGINE it comes from. */
         const DSA_METHOD *mtmp;
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(meth->flags & DSA_FLAG_FIPS_METHOD))
-                {
-                DSAerr(DSA_F_DSA_SET_METHOD, DSA_R_NON_FIPS_METHOD);
-                return 0;
-                }
-#endif
         mtmp = dsa->meth;
         if (mtmp->finish) mtmp->finish(dsa);
 #ifndef OPENSSL_NO_ENGINE
         if (dsa->engine)
                 {
                 ENGINE_finish(dsa->engine);
                 dsa->engine = NULL;
                 }
 #endif
         dsa->meth = meth;
@@ skipping 31 matching lines @@
                 if(!ret->meth)
                         {
                         DSAerr(DSA_F_DSA_NEW_METHOD,
                                 ERR_R_ENGINE_LIB);
                         ENGINE_finish(ret->engine);
                         OPENSSL_free(ret);
                         return NULL;
                         }
                 }
 #endif
-#ifdef OPENSSL_FIPS
-        if (FIPS_mode() && !(ret->meth->flags & DSA_FLAG_FIPS_METHOD))
-                {
-                DSAerr(DSA_F_DSA_NEW_METHOD, DSA_R_NON_FIPS_METHOD);
-#ifndef OPENSSL_NO_ENGINE
-                if (ret->engine)
-                        ENGINE_finish(ret->engine);
-#endif
-                OPENSSL_free(ret);
-                return NULL;
-                }
-#endif
 
         ret->pad=0;
         ret->version=0;
         ret->write_params=1;
         ret->p=NULL;
         ret->q=NULL;
         ret->g=NULL;
 
         ret->pub_key=NULL;
         ret->priv_key=NULL;
 
         ret->kinv=NULL;
         ret->r=NULL;
         ret->method_mont_p=NULL;
 
         ret->references=1;
-        ret->flags=ret->meth->flags & ~DSA_FLAG_NON_FIPS_ALLOW;
+        ret->flags=ret->meth->flags;
         CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data);
         if ((ret->meth->init != NULL) && !ret->meth->init(ret))
                 {
 #ifndef OPENSSL_NO_ENGINE
                 if (ret->engine)
                         ENGINE_finish(ret->engine);
 #endif
                 CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data);
                 OPENSSL_free(ret);
                 ret=NULL;
@@ skipping 49 matching lines @@
 #ifdef REF_CHECK
         if (i < 2)
                 {
                 fprintf(stderr, "DSA_up_ref, bad reference count\n");
                 abort();
                 }
 #endif
         return ((i > 1) ? 1 : 0);
         }
 
+int DSA_size(const DSA *r)
+        {
+        int ret,i;
+        ASN1_INTEGER bs;
+        unsigned char buf[4];   /* 4 bytes looks really small.
+                                   However, i2d_ASN1_INTEGER() will not look
+                                   beyond the first byte, as long as the second
+                                   parameter is NULL. */
+
+        i=BN_num_bits(r->q);
+        bs.length=(i+7)/8;
+        bs.data=buf;
+        bs.type=V_ASN1_INTEGER;
+        /* If the top bit is set the asn1 encoding is 1 larger. */
+        buf[0]=0xff;    
+
+        i=i2d_ASN1_INTEGER(&bs,NULL);
+        i+=i; /* r and s */
+        ret=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
+        return(ret);
+        }
+
 int DSA_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
              CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
         {
         return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DSA, argl, argp,
                                 new_func, dup_func, free_func);
         }
 
 int DSA_set_ex_data(DSA *d, int idx, void *arg)
         {
         return(CRYPTO_set_ex_data(&d->ex_data,idx,arg));
@@ skipping 34 matching lines @@
                         goto err;
 
         return ret;
 
  err:
         if (ret != NULL)
                 DH_free(ret);
         return NULL;
         }
 #endif