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

openssl/crypto/dsa/dsa_ossl.c

 /* crypto/dsa/dsa_ossl.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 43 matching lines @@
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
 
 /* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
 
 #include <stdio.h>
 #include "cryptlib.h"
 #include <openssl/bn.h>
+#include <openssl/sha.h>
 #include <openssl/dsa.h>
 #include <openssl/rand.h>
 #include <openssl/asn1.h>
 
-#ifndef OPENSSL_FIPS
-
 static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa);
 static int dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp);
 static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
-                  DSA *dsa);
+                         DSA *dsa);
 static int dsa_init(DSA *dsa);
 static int dsa_finish(DSA *dsa);
 
 static DSA_METHOD openssl_dsa_meth = {
 "OpenSSL DSA method",
 dsa_do_sign,
 dsa_sign_setup,
 dsa_do_verify,
 NULL, /* dsa_mod_exp, */
 NULL, /* dsa_bn_mod_exp, */
@@ skipping 44 matching lines @@
 {
         return &openssl_dsa_meth;
 }
 
 static DSA_SIG *dsa_do_sign(const unsigned char *dgst, int dlen, DSA *dsa)
         {
         BIGNUM *kinv=NULL,*r=NULL,*s=NULL;
         BIGNUM m;
         BIGNUM xr;
         BN_CTX *ctx=NULL;
-        int i,reason=ERR_R_BN_LIB;
+        int reason=ERR_R_BN_LIB;
         DSA_SIG *ret=NULL;
 
         BN_init(&m);
         BN_init(&xr);
 
         if (!dsa->p || !dsa->q || !dsa->g)
                 {
                 reason=DSA_R_MISSING_PARAMETERS;
                 goto err;
                 }
 
         s=BN_new();
         if (s == NULL) goto err;
-
-        i=BN_num_bytes(dsa->q); /* should be 20 */
-        if ((dlen > i) || (dlen > 50))
-                {
-                reason=DSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE;
-                goto err;
-                }
-
         ctx=BN_CTX_new();
         if (ctx == NULL) goto err;
 
         if ((dsa->kinv == NULL) || (dsa->r == NULL))
                 {
                 if (!DSA_sign_setup(dsa,ctx,&kinv,&r)) goto err;
                 }
         else
                 {
                 kinv=dsa->kinv;
                 dsa->kinv=NULL;
                 r=dsa->r;
                 dsa->r=NULL;
                 }
 
-        if (BN_bin2bn(dgst,dlen,&m) == NULL) goto err;
+        
+        if (dlen > BN_num_bytes(dsa->q))
+                /* if the digest length is greater than the size of q use the
+                 * BN_num_bits(dsa->q) leftmost bits of the digest, see
+                 * fips 186-3, 4.2 */
+                dlen = BN_num_bytes(dsa->q);
+        if (BN_bin2bn(dgst,dlen,&m) == NULL)
+                goto err;
 
         /* Compute  s = inv(k) (m + xr) mod q */
         if (!BN_mod_mul(&xr,dsa->priv_key,r,dsa->q,ctx)) goto err;/* s = xr */
         if (!BN_add(s, &xr, &m)) goto err;              /* s = m + xr */
         if (BN_cmp(s,dsa->q) > 0)
-                BN_sub(s,s,dsa->q);
+                if (!BN_sub(s,s,dsa->q)) goto err;
         if (!BN_mod_mul(s,s,kinv,dsa->q,ctx)) goto err;
 
         ret=DSA_SIG_new();
         if (ret == NULL) goto err;
         ret->r = r;
         ret->s = s;
         
 err:
         if (!ret)
                 {
@@ skipping 84 matching lines @@
         if (*kinvp != NULL) BN_clear_free(*kinvp);
         *kinvp=kinv;
         kinv=NULL;
         if (*rp != NULL) BN_clear_free(*rp);
         *rp=r;
         ret=1;
 err:
         if (!ret)
                 {
                 DSAerr(DSA_F_DSA_SIGN_SETUP,ERR_R_BN_LIB);
-                if (kinv != NULL) BN_clear_free(kinv);
-                if (r != NULL) BN_clear_free(r);
+                if (r != NULL)
+                        BN_clear_free(r);
                 }
         if (ctx_in == NULL) BN_CTX_free(ctx);
-        if (kinv != NULL) BN_clear_free(kinv);
         BN_clear_free(&k);
         BN_clear_free(&kq);
         return(ret);
         }
 
 static int dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig,
-                  DSA *dsa)
+                         DSA *dsa)
         {
         BN_CTX *ctx;
         BIGNUM u1,u2,t1;
         BN_MONT_CTX *mont=NULL;
-        int ret = -1;
+        int ret = -1, i;
         if (!dsa->p || !dsa->q || !dsa->g)
                 {
                 DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MISSING_PARAMETERS);
                 return -1;
                 }
 
-        if (BN_num_bits(dsa->q) != 160)
+        i = BN_num_bits(dsa->q);
+        /* fips 186-3 allows only different sizes for q */
+        if (i != 160 && i != 224 && i != 256)
                 {
                 DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_BAD_Q_VALUE);
                 return -1;
                 }
 
         if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS)
                 {
                 DSAerr(DSA_F_DSA_DO_VERIFY,DSA_R_MODULUS_TOO_LARGE);
                 return -1;
                 }
-
         BN_init(&u1);
         BN_init(&u2);
         BN_init(&t1);
 
         if ((ctx=BN_CTX_new()) == NULL) goto err;
 
         if (BN_is_zero(sig->r) || BN_is_negative(sig->r) ||
             BN_ucmp(sig->r, dsa->q) >= 0)
                 {
                 ret = 0;
                 goto err;
                 }
         if (BN_is_zero(sig->s) || BN_is_negative(sig->s) ||
             BN_ucmp(sig->s, dsa->q) >= 0)
                 {
                 ret = 0;
                 goto err;
                 }
 
         /* Calculate W = inv(S) mod Q
          * save W in u2 */
         if ((BN_mod_inverse(&u2,sig->s,dsa->q,ctx)) == NULL) goto err;
 
         /* save M in u1 */
+        if (dgst_len > (i >> 3))
+                /* if the digest length is greater than the size of q use the
+                 * BN_num_bits(dsa->q) leftmost bits of the digest, see
+                 * fips 186-3, 4.2 */
+                dgst_len = (i >> 3);
         if (BN_bin2bn(dgst,dgst_len,&u1) == NULL) goto err;
 
         /* u1 = M * w mod q */
         if (!BN_mod_mul(&u1,&u1,&u2,dsa->q,ctx)) goto err;
 
         /* u2 = r * w mod q */
         if (!BN_mod_mul(&u2,sig->r,&u2,dsa->q,ctx)) goto err;
 
 
         if (dsa->flags & DSA_FLAG_CACHE_MONT_P)
@@ skipping 31 matching lines @@
         return(1);
 }
 
 static int dsa_finish(DSA *dsa)
 {
         if(dsa->method_mont_p)
                 BN_MONT_CTX_free(dsa->method_mont_p);
         return(1);
 }
 
-#endif