* crypto/ui/ui_lib.c: misplaced brace in switch statement.

[openssl.git] / crypto / ui / ui_compat.h

diff --git a/crypto/ui/ui_compat.h b/crypto/ui/ui_compat.h
index 519f3654b09296bd5310dc0b07f3ff93690da9cc..b35c9bb7fd3163202db96ed9c486ec77c08c81d4 100644 (file)
--- a/crypto/ui/ui_compat.h
+++ b/crypto/ui/ui_compat.h
@@ -1,9 +1,9 @@
 /* crypto/ui/ui.h -*- mode:C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte (levitte@stacken.kth.se) for the OpenSSL
- * project 2000.
+/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
+ * project 2001.
  */
 /* ====================================================================
- * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2001 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
@@ -61,9 +61,6 @@
 
 #include <openssl/opensslconf.h>
 #include <openssl/ui.h>
-#ifndef OPENSSL_NO_DES
-#include <openssl/des.h>
-#endif
 
 #ifdef  __cplusplus
 extern "C" {
@@ -72,14 +69,13 @@ extern "C" {
 /* The following functions were previously part of the DES section,
    and are provided here for backward compatibility reasons. */
 
-#ifndef OPENSSL_NO_DES
-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);
-#endif
+#define des_read_pw_string(b,l,p,v) \
+       _ossl_old_des_read_pw_string((b),(l),(p),(v))
+#define des_read_pw(b,bf,s,p,v) \
+       _ossl_old_des_read_pw((b),(bf),(s),(p),(v))
 
-int des_read_pw_string(char *buf,int length,const char *prompt,int verify);
-int des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify);
+int _ossl_old_des_read_pw_string(char *buf,int length,const char *prompt,int verify);
+int _ossl_old_des_read_pw(char *buf,char *buff,int size,const char *prompt,int verify);
 
 #ifdef  __cplusplus
 }