44bdb056d4
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.
86 lines
3.3 KiB
C
86 lines
3.3 KiB
C
/* crypto/ui/ui_util.c -*- mode:C; c-file-style: "eay" -*- */
|
|
/* ====================================================================
|
|
* 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).
|
|
*
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <openssl/ui.h>
|
|
|
|
int UI_UTIL_read_pw_string(char *buf,int length,const char *prompt,int verify)
|
|
{
|
|
char buff[BUFSIZ];
|
|
int ret;
|
|
|
|
ret=UI_UTIL_read_pw(buf,buff,(length>BUFSIZ)?BUFSIZ:length,prompt,verify);
|
|
memset(buff,0,BUFSIZ);
|
|
return(ret);
|
|
}
|
|
|
|
int UI_UTIL_read_pw(char *buf,char *buff,int size,const char *prompt,int verify)
|
|
{
|
|
int ok = 0;
|
|
UI *ui;
|
|
|
|
ui = UI_new();
|
|
if (ui)
|
|
{
|
|
ok = UI_add_input_string(ui,prompt,0,buf,0,BUFSIZ-1);
|
|
if (ok == 0 && verify)
|
|
ok = UI_add_verify_string(ui,prompt,0,buff,0,BUFSIZ-1,
|
|
buf);
|
|
if (ok == 0)
|
|
ok=UI_process(ui);
|
|
UI_free(ui);
|
|
}
|
|
return(ok);
|
|
}
|