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

openssl/apps/enc.c

 /* apps/enc.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 49 matching lines @@
 #include <stdlib.h>
 #include <string.h>
 #include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/rand.h>
 #include <openssl/pem.h>
+#include <openssl/comp.h>
 #include <ctype.h>
 
 int set_hex(char *in,unsigned char *out,int size);
 #undef SIZE
 #undef BSIZE
 #undef PROG
 
 #define SIZE    (512)
 #define BSIZE   (8*1024)
 #define PROG    enc_main
@@ skipping 13 matching lines @@
                 n=0;
                 }
         else
                 BIO_printf(bio," ");
         }
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
         {
-#ifndef OPENSSL_NO_ENGINE
-        ENGINE *e = NULL;
-#endif
         static const char magic[]="Salted__";
         char mbuf[sizeof magic-1];
         char *strbuf=NULL;
         unsigned char *buff=NULL,*bufsize=NULL;
         int bsize=BSIZE,verbose=0;
         int ret=1,inl;
         int nopad = 0;
         unsigned char key[EVP_MAX_KEY_LENGTH],iv[EVP_MAX_IV_LENGTH];
         unsigned char salt[PKCS5_SALT_LEN];
         char *str=NULL, *passarg = NULL, *pass = NULL;
         char *hkey=NULL,*hiv=NULL,*hsalt = NULL;
         char *md=NULL;
         int enc=1,printkey=0,i,base64=0;
+#ifdef ZLIB
+        int do_zlib=0;
+        BIO *bzl = NULL;
+#endif
         int debug=0,olb64=0,nosalt=0;
         const EVP_CIPHER *cipher=NULL,*c;
         EVP_CIPHER_CTX *ctx = NULL;
         char *inf=NULL,*outf=NULL;
         BIO *in=NULL,*out=NULL,*b64=NULL,*benc=NULL,*rbio=NULL,*wbio=NULL;
 #define PROG_NAME_SIZE  39
         char pname[PROG_NAME_SIZE+1];
 #ifndef OPENSSL_NO_ENGINE
         char *engine = NULL;
 #endif
         const EVP_MD *dgst=NULL;
-        int non_fips_allow = 0;
 
         apps_startup();
 
         if (bio_err == NULL)
                 if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                         BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
         if (!load_config(bio_err, NULL))
                 goto end;
 
         /* first check the program name */
         program_name(argv[0],pname,sizeof pname);
         if (strcmp(pname,"base64") == 0)
                 base64=1;
+#ifdef ZLIB
+        if (strcmp(pname,"zlib") == 0)
+                do_zlib=1;
+#endif
 
         cipher=EVP_get_cipherbyname(pname);
+#ifdef ZLIB
+        if (!do_zlib && !base64 && (cipher == NULL)
+                                && (strcmp(pname,"enc") != 0))
+#else
         if (!base64 && (cipher == NULL) && (strcmp(pname,"enc") != 0))
+#endif
                 {
                 BIO_printf(bio_err,"%s is an unknown cipher\n",pname);
                 goto bad;
                 }
 
         argc--;
         argv++;
         while (argc >= 1)
                 {
                 if      (strcmp(*argv,"-e") == 0)
@@ skipping 35 matching lines @@
                 else if (strcmp(*argv,"-debug") == 0)
                         debug=1;
                 else if (strcmp(*argv,"-P") == 0)
                         printkey=2;
                 else if (strcmp(*argv,"-A") == 0)
                         olb64=1;
                 else if (strcmp(*argv,"-a") == 0)
                         base64=1;
                 else if (strcmp(*argv,"-base64") == 0)
                         base64=1;
+#ifdef ZLIB
+                else if (strcmp(*argv,"-z") == 0)
+                        do_zlib=1;
+#endif
                 else if (strcmp(*argv,"-bufsize") == 0)
                         {
                         if (--argc < 1) goto bad;
                         bufsize=(unsigned char *)*(++argv);
                         }
                 else if (strcmp(*argv,"-k") == 0)
                         {
                         if (--argc < 1) goto bad;
                         str= *(++argv);
                         }
@@ skipping 47 matching lines @@
                 else if (strcmp(*argv,"-iv") == 0)
                         {
                         if (--argc < 1) goto bad;
                         hiv= *(++argv);
                         }
                 else if (strcmp(*argv,"-md") == 0)
                         {
                         if (--argc < 1) goto bad;
                         md= *(++argv);
                         }
-                else if (strcmp(*argv,"-non-fips-allow") == 0)
-                        non_fips_allow = 1;
                 else if ((argv[0][0] == '-') &&
                         ((c=EVP_get_cipherbyname(&(argv[0][1]))) != NULL))
                         {
                         cipher=c;
                         }
                 else if (strcmp(*argv,"-none") == 0)
                         cipher=NULL;
                 else
                         {
                         BIO_printf(bio_err,"unknown option '%s'\n",*argv);
 bad:
                         BIO_printf(bio_err,"options are\n");
                         BIO_printf(bio_err,"%-14s input file\n","-in <file>");
                         BIO_printf(bio_err,"%-14s output file\n","-out <file>");
                         BIO_printf(bio_err,"%-14s pass phrase source\n","-pass <arg>");
                         BIO_printf(bio_err,"%-14s encrypt\n","-e");
                         BIO_printf(bio_err,"%-14s decrypt\n","-d");
                         BIO_printf(bio_err,"%-14s base64 encode/decode, depending on encryption flag\n","-a/-base64");
                         BIO_printf(bio_err,"%-14s passphrase is the next argument\n","-k");
                         BIO_printf(bio_err,"%-14s passphrase is the first line of the file argument\n","-kfile");
                         BIO_printf(bio_err,"%-14s the next argument is the md to use to create a key\n","-md");
                         BIO_printf(bio_err,"%-14s   from a passphrase.  One of md2, md5, sha or sha1\n","");
+                        BIO_printf(bio_err,"%-14s salt in hex is the next argument\n","-S");
                         BIO_printf(bio_err,"%-14s key/iv in hex is the next argument\n","-K/-iv");
                         BIO_printf(bio_err,"%-14s print the iv/key (then exit if -P)\n","-[pP]");
                         BIO_printf(bio_err,"%-14s buffer size\n","-bufsize <n>");
+                        BIO_printf(bio_err,"%-14s disable standard block padding\n","-nopad");
 #ifndef OPENSSL_NO_ENGINE
                         BIO_printf(bio_err,"%-14s use engine e, possibly a hardware device.\n","-engine e");
 #endif
 
                         BIO_printf(bio_err,"Cipher Types\n");
                         OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
                                                show_ciphers,
                                                bio_err);
                         BIO_printf(bio_err,"\n");
 
                         goto end;
                         }
                 argc--;
                 argv++;
                 }
 
 #ifndef OPENSSL_NO_ENGINE
-        e = setup_engine(bio_err, engine, 0);
+        setup_engine(bio_err, engine, 0);
 #endif
 
         if (md && (dgst=EVP_get_digestbyname(md)) == NULL)
                 {
                 BIO_printf(bio_err,"%s is an unsupported message digest type\n",md);
                 goto end;
                 }
 
         if (dgst == NULL)
                 {
-                if (in_FIPS_mode)
-                        dgst = EVP_sha1();
-                else
-                        dgst = EVP_md5();
+                dgst = EVP_md5();
                 }
 
         if (bufsize != NULL)
                 {
                 unsigned long n;
 
                 for (n=0; *bufsize; bufsize++)
                         {
                         i= *bufsize;
                         if ((i <= '9') && (i >= '0'))
@@ skipping 36 matching lines @@
         if (debug)
                 {
                 BIO_set_callback(in,BIO_debug_callback);
                 BIO_set_callback(out,BIO_debug_callback);
                 BIO_set_callback_arg(in,(char *)bio_err);
                 BIO_set_callback_arg(out,(char *)bio_err);
                 }
 
         if (inf == NULL)
                 {
+#ifndef OPENSSL_NO_SETVBUF_IONBF
                 if (bufsize != NULL)
                         setvbuf(stdin, (char *)NULL, _IONBF, 0);
+#endif /* ndef OPENSSL_NO_SETVBUF_IONBF */
                 BIO_set_fp(in,stdin,BIO_NOCLOSE);
                 }
         else
                 {
                 if (BIO_read_filename(in,inf) <= 0)
                         {
                         perror(inf);
                         goto end;
                         }
                 }
@@ skipping 32 matching lines @@
                                 BIO_printf(bio_err,"bad password read\n");
                                 goto end;
                                 }
                         }
                 }
 
 
         if (outf == NULL)
                 {
                 BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifndef OPENSSL_NO_SETVBUF_IONBF
                 if (bufsize != NULL)
                         setvbuf(stdout, (char *)NULL, _IONBF, 0);
+#endif /* ndef OPENSSL_NO_SETVBUF_IONBF */
 #ifdef OPENSSL_SYS_VMS
                 {
                 BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                 out = BIO_push(tmpbio, out);
                 }
 #endif
                 }
         else
                 {
                 if (BIO_write_filename(out,outf) <= 0)
                         {
                         perror(outf);
                         goto end;
                         }
                 }
 
         rbio=in;
         wbio=out;
 
+#ifdef ZLIB
+
+        if (do_zlib)
+                {
+                if ((bzl=BIO_new(BIO_f_zlib())) == NULL)
+                        goto end;
+                if (enc)
+                        wbio=BIO_push(bzl,wbio);
+                else
+                        rbio=BIO_push(bzl,rbio);
+                }
+#endif
+
         if (base64)
                 {
                 if ((b64=BIO_new(BIO_f_base64())) == NULL)
                         goto end;
                 if (debug)
                         {
                         BIO_set_callback(b64,BIO_debug_callback);
                         BIO_set_callback_arg(b64,(char *)bio_err);
                         }
                 if (olb64)
@@ skipping 84 matching lines @@
                         }
 
                 if ((benc=BIO_new(BIO_f_cipher())) == NULL)
                         goto end;
 
                 /* Since we may be changing parameters work on the encryption
                  * context rather than calling BIO_set_cipher().
                  */
 
                 BIO_get_cipher_ctx(benc, &ctx);
-
-                if (non_fips_allow)
-                        EVP_CIPHER_CTX_set_flags(ctx,
-                                EVP_CIPH_FLAG_NON_FIPS_ALLOW);
-
                 if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc))
                         {
                         BIO_printf(bio_err, "Error setting cipher %s\n",
                                 EVP_CIPHER_name(cipher));
                         ERR_print_errors(bio_err);
                         goto end;
                         }
 
                 if (nopad)
                         EVP_CIPHER_CTX_set_padding(ctx, 0);
@@ skipping 70 matching lines @@
                 BIO_printf(bio_err,"bytes written:%8ld\n",BIO_number_written(out));
                 }
 end:
         ERR_print_errors(bio_err);
         if (strbuf != NULL) OPENSSL_free(strbuf);
         if (buff != NULL) OPENSSL_free(buff);
         if (in != NULL) BIO_free(in);
         if (out != NULL) BIO_free_all(out);
         if (benc != NULL) BIO_free(benc);
         if (b64 != NULL) BIO_free(b64);
+#ifdef ZLIB
+        if (bzl != NULL) BIO_free(bzl);
+#endif
         if(pass) OPENSSL_free(pass);
         apps_shutdown();
         OPENSSL_EXIT(ret);
         }
 
 int set_hex(char *in, unsigned char *out, int size)
         {
         int i,n;
         unsigned char j;
 
@@ skipping 20 matching lines @@
                         BIO_printf(bio_err,"non-hex digit\n");
                         return(0);
                         }
                 if (i&1)
                         out[i/2]|=j;
                 else
                         out[i/2]=(j<<4);
                 }
         return(1);
         }