Commit 44bdb056 authored by Richard Levitte's avatar Richard Levitte
Browse files

With the changed des_old API, let's complete the work by renaming the 

functions in ui_compat.  This gave reason to rework that part more
thoroughly, so here are the changes made:

1. Add DES_read_password() and DES_read_2passwords() with the same
   functionality as the corresponding old des_ functions, as a
   convenience to the users.
2. Add UI_UTIL_read_pw_string() and UI_UTIL_read_pw() with the
   functionality from des_read_pw_string() and des_read_pw(), again as
   a concenience to the users.
3. Rename des_read_password(), des_read_2passwords(),
   des_read_pw_string() and des_read_pw() by changing des_ to
   _ossl_old_des_, and add the usual mapping macros.
4. Move the implementation of des_read_password() and
   des_read_2passwords() to the des directory, since they are tightly
   tied to DES anyway.

This change was inspired by a patch from Assar Westerlund <assar@sics.se>:

There are some functions that didn't get the kick-away-old-des-and-
replace-des-with-DES action.  Here's a patch that adds DES_ and des_
(in des_old.h) versions of des_read_pw_string et al.  This patch
includes some of the first des_old.h semi-colon macro fixes that I've
already sent.
parent c31bbf1e

crypto/des/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ LIBSRC= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c \ 
	qud_cksm.c rand_key.c rpc_enc.c  set_key.c  \

	des_enc.c fcrypt_b.c \

	xcbc_enc.c \

	str2key.c  cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c

	str2key.c  cfb64ede.c ofb64ede.c ede_cbcm_enc.c des_old.c read2pwd.c



LIBOBJ= set_key.o  ecb_enc.o  cbc_enc.o \

	ecb3_enc.o cfb64enc.o cfb64ede.o cfb_enc.o  ofb64ede.o \
@@ -42,7 +42,7 @@ LIBOBJ= set_key.o ecb_enc.o cbc_enc.o \ 
	ofb_enc.o  str2key.o  pcbc_enc.o qud_cksm.o rand_key.o \

	${DES_ENC} \

	fcrypt.o xcbc_enc.o rpc_enc.o  cbc_cksm.o \

	ede_cbcm_enc.o des_old.o

	ede_cbcm_enc.o des_old.o read2pwd.o



SRC= $(LIBSRC)

crypto/des/des.h

+4 −0
Original line number Diff line number Diff line
@@ -221,6 +221,10 @@ void DES_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length, 
void DES_ofb64_encrypt(const unsigned char *in,unsigned char *out,long length,

		       DES_key_schedule *schedule,DES_cblock *ivec,int *num);



int DES_read_password(DES_cblock *key, const char *prompt, int verify);

int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt,

	int verify);



#define DES_fixup_key_parity DES_set_odd_parity



#ifdef  __cplusplus

crypto/des/des_old.c

+10 −0
Original line number Diff line number Diff line
@@ -223,6 +223,16 @@ void _ossl_old_des_random_key(des_cblock ret) 
	{

	DES_random_key((DES_cblock *)ret);

	}

int _ossl_old_des_read_password(des_cblock *key, const char *prompt,

				int verify)

	{

	return DES_read_password(key, prompt, verify);

	}

int _ossl_old_des_read_2passwords(des_cblock *key1, des_cblock *key2,

	const char *prompt, int verify)

	{

	return DES_read_2passwords(key1, key2, prompt, verify);

	}

void _ossl_old_des_set_odd_parity(des_cblock *key)

	{

	DES_set_odd_parity(key);

crypto/des/des_old.h

+10 −0
Original line number Diff line number Diff line
@@ -161,6 +161,10 @@ typedef struct des_ks_struct 
	_ossl_old_des_random_seed((k))

#define des_random_key(r)\

	_ossl_old_des_random_key((r))

#define des_read_password(k,p,v) \

	_ossl_old_des_read_password((k),(p),(v))

#define des_read_2passwords(k1,k2,p,v) \

	_ossl_old_des_read_2passwords((k1),(k2),(p),(v))

#define des_set_odd_parity(k)\

	_ossl_old_des_set_odd_parity((k))

#define des_is_weak_key(k)\
@@ -247,6 +251,9 @@ DES_LONG _ossl_old_des_quad_cksum(des_cblock *input,des_cblock *output, 
	long length,int out_count,des_cblock *seed);

void _ossl_old_des_random_seed(des_cblock key);

void _ossl_old_des_random_key(des_cblock ret);

int _ossl_old_des_read_password(des_cblock *key,const char *prompt,int verify);

int _ossl_old_des_read_2passwords(des_cblock *key1,des_cblock *key2,

	const char *prompt,int verify);

void _ossl_old_des_set_odd_parity(des_cblock *key);

int _ossl_old_des_is_weak_key(des_cblock *key);

int _ossl_old_des_set_key(des_cblock *key,des_key_schedule schedule);
@@ -296,4 +303,7 @@ void _ossl_old_des_ofb64_encrypt(unsigned char *in, unsigned char *out, long len 
}

#endif



/* for DES_read_pw_string et al */

#include <openssl/ui_compat.h>



#endif

crypto/des/read2pwd.c

+60 −19
Original line number Diff line number Diff line 
/* crypto/des/read2pwd.c */

/* ====================================================================

 * Copyright (c) 2001-2002 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer. 

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    openssl-core@openssl.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */

/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

 * All rights reserved.

 *
@@ -56,41 +109,29 @@ 
 * [including the GNU Public Licence.]

 */



#include "des_locl.h"

#include <openssl/des.h>

#include <openssl/ui.h>



int des_read_password(des_cblock *key, const char *prompt, int verify)

int DES_read_password(DES_cblock *key, const char *prompt, int verify)

	{

	int ok;

	char buf[BUFSIZ],buff[BUFSIZ];

	UI *ui;



	ui = UI_new();

	UI_add_input_string(ui,prompt,0,buf,0,BUFSIZ-1);

	if (verify)

		UI_add_verify_string(ui,prompt,0,buff,0,BUFSIZ-1,buf);

	if ((ok=UI_process(ui)) == 0)

		des_string_to_key(buf,key);

	UI_free(ui);

	if ((ok=UI_UTIL_read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0)

		DES_string_to_key(buf,key);

	memset(buf,0,BUFSIZ);

	memset(buff,0,BUFSIZ);

	return(ok);

	}



int des_read_2passwords(des_cblock *key1, des_cblock *key2, const char *prompt,

int DES_read_2passwords(DES_cblock *key1, DES_cblock *key2, const char *prompt,

	     int verify)

	{

	int ok;

	char buf[BUFSIZ],buff[BUFSIZ];

	UI *ui;



	ui = UI_new();

	UI_add_input_string(ui,prompt,0,buf,0,BUFSIZ-1);

	if (verify)

		UI_add_verify_string(ui,prompt,0,buff,0,BUFSIZ-1,buf);

	if ((ok=UI_process(ui)) == 0)

		des_string_to_2keys(buf,key1,key2);

	UI_free(ui);

	if ((ok=UI_UTIL_read_pw(buf,buff,BUFSIZ,prompt,verify)) == 0)

		DES_string_to_2keys(buf,key1,key2);

	memset(buf,0,BUFSIZ);

	memset(buff,0,BUFSIZ);

	return(ok);