[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: openssl/apps/ enc.c
From:       "Richard Levitte" <levitte () openssl ! org>
Date:       2005-04-30 15:17:05
Message-ID: 20050430151705.F2986203641 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Richard Levitte
  Root:   /e/openssl/cvs                   Email:  levitte@openssl.org
  Module: openssl                          Date:   30-Apr-2005 17:17:05
  Branch: HEAD                             Handle: 2005043016170500

  Modified files:
    openssl/apps            enc.c

  Log:
    All kinds of changes from branch OpenSSL_0_9_7-stable

  Summary:
    Revision    Changes     Path
    1.45        +46 -7      openssl/apps/enc.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/apps/enc.c
  ============================================================================
  $ cvs diff -u -r1.44 -r1.45 enc.c
  --- openssl/apps/enc.c	27 Dec 2003 14:40:17 -0000	1.44
  +++ openssl/apps/enc.c	30 Apr 2005 15:17:05 -0000	1.45
  @@ -114,9 +114,11 @@
   	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;
   	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
  @@ -124,6 +126,7 @@
   #ifndef OPENSSL_NO_ENGINE
   	char *engine = NULL;
   #endif
  +	const EVP_MD *dgst=NULL;
   
   	apps_startup();
   
  @@ -253,6 +256,11 @@
   			if (--argc < 1) goto bad;
   			hiv= *(++argv);
   			}
  +		else if (strcmp(*argv,"-md") == 0)
  +			{
  +			if (--argc < 1) goto bad;
  +			md= *(++argv);
  +			}
   		else if	((argv[0][0] == '-') &&
   			((c=EVP_get_cipherbyname(&(argv[0][1]))) != NULL))
   			{
  @@ -271,8 +279,10 @@
   			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 key is the next argument\n","-k");
  -			BIO_printf(bio_err,"%-14s key is the first line of the file argument\n","-kfile");
  +			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 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>");
  @@ -296,6 +306,17 @@
           e = 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)
  +		{
  +		dgst = EVP_md5();
  +		}
  +
   	if (bufsize != NULL)
   		{
   		unsigned long n;
  @@ -483,7 +504,7 @@
   				sptr = salt;
   			}
   
  -			EVP_BytesToKey(cipher,EVP_md5(),sptr,
  +			EVP_BytesToKey(cipher,dgst,sptr,
   				(unsigned char *)str,
   				strlen(str),1,key,iv);
   			/* zero the complete buffer or the string
  @@ -516,13 +537,31 @@
   
   		if ((benc=BIO_new(BIO_f_cipher())) == NULL)
   			goto end;
  -		BIO_set_cipher(benc,cipher,key,iv,enc);
  -		if (nopad)
  +
  +		/* Since we may be changing parameters work on the encryption
  +		 * context rather than calling BIO_set_cipher().
  +		 */
  +
  +		BIO_get_cipher_ctx(benc, &ctx);
  +		if (!EVP_CipherInit_ex(ctx, cipher, NULL, NULL, NULL, enc))
   			{
  -			EVP_CIPHER_CTX *ctx;
  -			BIO_get_cipher_ctx(benc, &ctx);
  +			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);
  +
  +		if (!EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, enc))
  +			{
  +			BIO_printf(bio_err, "Error setting cipher %s\n",
  +				EVP_CIPHER_name(cipher));
  +			ERR_print_errors(bio_err);
  +			goto end;
   			}
  +
   		if (debug)
   			{
   			BIO_set_callback(benc,BIO_debug_callback);
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]