Remove ui_compat

This is the last of the old DES API.

Reviewed-by: Richard Levitte <levitte@openssl.org>

diff --git a/crypto/crypto-lib.com b/crypto/crypto-lib.com
index 0b76a3311d29e411f19ca58b084c15ba35b6067d..bf014714e6905fc0eedf6b85e72f1efcce8d2514 100644 (file)
--- a/crypto/crypto-lib.com
+++ b/crypto/crypto-lib.com
@@ -342,8 +342,7 @@ $ LIB_COMP = "comp_lib,comp_err,"+ -
        "c_rle,c_zlib"
 $ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -
        "ocsp_srv,ocsp_prn,ocsp_vfy,ocsp_err"
        "c_rle,c_zlib"
 $ LIB_OCSP = "ocsp_asn,ocsp_ext,ocsp_ht,ocsp_lib,ocsp_cl,"+ -
        "ocsp_srv,ocsp_prn,ocsp_vfy,ocsp_err"

-$ LIB_UI_COMPAT = ",ui_compat"
-$ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"+LIB_UI_COMPAT
+$ LIB_UI = "ui_err,ui_lib,ui_openssl,ui_util"

 $ LIB_KRB5 = "krb5_asn"
 $ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -
        "cms_sd,cms_dd,cms_cd,cms_env,cms_enc,cms_ess,"+ -
 $ LIB_KRB5 = "krb5_asn"
 $ LIB_CMS = "cms_lib,cms_asn1,cms_att,cms_io,cms_smime,cms_err,"+ -
        "cms_sd,cms_dd,cms_cd,cms_env,cms_enc,cms_ess,"+ -

diff --git a/crypto/symhacks.h b/crypto/symhacks.h
index 03cdb1ad64030500c7f287dbec36e18a57853785..97856851db9b99a426439adaa9a69d8bb3d8120f 100644 (file)
--- a/crypto/symhacks.h
+++ b/crypto/symhacks.h
@@ -229,12 +229,6 @@
 #  undef OCSP_SINGLERESP_get_ext_by_critical
 #  define OCSP_SINGLERESP_get_ext_by_critical     OCSP_SINGLERESP_get_ext_by_crit
 
 #  undef OCSP_SINGLERESP_get_ext_by_critical
 #  define OCSP_SINGLERESP_get_ext_by_critical     OCSP_SINGLERESP_get_ext_by_crit
 

-/* Hack some long DES names */
-#  undef _ossl_old_des_ede3_cfb64_encrypt
-#  define _ossl_old_des_ede3_cfb64_encrypt        _ossl_odes_ede3_cfb64_encrypt
-#  undef _ossl_old_des_ede3_ofb64_encrypt
-#  define _ossl_old_des_ede3_ofb64_encrypt        _ossl_odes_ede3_ofb64_encrypt
-

 /* Hack some long EVP names */
 #  undef OPENSSL_add_all_algorithms_noconf
 #  define OPENSSL_add_all_algorithms_noconf       OPENSSL_add_all_algo_noconf
 /* Hack some long EVP names */
 #  undef OPENSSL_add_all_algorithms_noconf
 #  define OPENSSL_add_all_algorithms_noconf       OPENSSL_add_all_algo_noconf

diff --git a/crypto/ui/Makefile b/crypto/ui/Makefile
index a685659fb4c88466d0e1e384ca81edfe43bbe976..f0376a37bae7b0a9f77e5286076946c76eee3e93 100644 (file)
--- a/crypto/ui/Makefile
+++ b/crypto/ui/Makefile
@@ -17,16 +17,13 @@ GENERAL=Makefile
 TEST=
 APPS=
 
 TEST=
 APPS=
 

-COMPATSRC= ui_compat.c
-COMPATOBJ= ui_compat.o
-

 LIB=$(TOP)/libcrypto.a
 LIB=$(TOP)/libcrypto.a

-LIBSRC= ui_err.c ui_lib.c ui_openssl.c ui_util.c $(COMPATSRC)
-LIBOBJ= ui_err.o ui_lib.o ui_openssl.o ui_util.o $(COMPATOBJ)
+LIBSRC= ui_err.c ui_lib.c ui_openssl.c ui_util.c
+LIBOBJ= ui_err.o ui_lib.o ui_openssl.o ui_util.o

 
 SRC= $(LIBSRC)
 
 
 SRC= $(LIBSRC)
 

-EXHEADER= ui.h ui_compat.h
+EXHEADER= ui.h

 HEADER=        $(EXHEADER) ui_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 HEADER=        $(EXHEADER) ui_locl.h
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)


@@ -78,10 +75,6 @@ clean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 

-ui_compat.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
-ui_compat.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h
-ui_compat.o: ../../include/openssl/stack.h ../../include/openssl/ui.h
-ui_compat.o: ../../include/openssl/ui_compat.h ui_compat.c

 ui_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 ui_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 ui_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 ui_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
 ui_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
 ui_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h

diff --git a/crypto/ui/ui_compat.c b/crypto/ui/ui_compat.c
deleted file mode 100644 (file)
index 0ca5284..0000000
--- a/crypto/ui/ui_compat.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* crypto/ui/ui_compat.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_compat.h>
-
-int _ossl_old_des_read_pw_string(char *buf, int length, const char *prompt,
-                                 int verify)
-{
-    return UI_UTIL_read_pw_string(buf, length, prompt, verify);
-}
-
-int _ossl_old_des_read_pw(char *buf, char *buff, int size, const char *prompt,
-                          int verify)
-{
-    return UI_UTIL_read_pw(buf, buff, size, prompt, verify);
-}

diff --git a/crypto/ui/ui_compat.h b/crypto/ui/ui_compat.h
deleted file mode 100644 (file)
index 42fb9ff..0000000
--- a/crypto/ui/ui_compat.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/* crypto/ui/ui.h -*- mode:C; c-file-style: "eay" -*- */
-/*
- * Written by Richard Levitte (richard@levitte.org) for the OpenSSL project
- * 2001.
- */
-/* ====================================================================
- * 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
- * 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).
- *
- */
-
-#ifndef HEADER_UI_COMPAT_H
-# define HEADER_UI_COMPAT_H
-
-# include <openssl/opensslconf.h>
-# include <openssl/ui.h>
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-/*
- * The following functions were previously part of the DES section, and are
- * provided here for backward compatibility reasons.
- */
-
-# 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 _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
-}
-#endif
-#endif

diff --git a/util/libeay.num b/util/libeay.num
index e77c94ecb9532a1cdf463498cdec5a0c3683eacb..32cba2e8d32f3d3ed8995a4cc7e78b854cec912f 100755 (executable)
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -795,8 +795,8 @@ DES_random_key                          802 EXIST::FUNCTION:DES
 _ossl_old_des_random_seed               803    NOEXIST::FUNCTION:
 _ossl_old_des_read_2passwords           804    NOEXIST::FUNCTION:
 _ossl_old_des_read_password             805    NOEXIST::FUNCTION:
 _ossl_old_des_random_seed               803    NOEXIST::FUNCTION:
 _ossl_old_des_read_2passwords           804    NOEXIST::FUNCTION:
 _ossl_old_des_read_password             805    NOEXIST::FUNCTION:

-_ossl_old_des_read_pw                   806    EXIST::FUNCTION:
-_ossl_old_des_read_pw_string            807    EXIST::FUNCTION:
+_ossl_old_des_read_pw                   806    NOEXIST::FUNCTION:
+_ossl_old_des_read_pw_string            807    NOEXIST::FUNCTION:

 DES_set_key                             808    EXIST::FUNCTION:DES
 DES_set_odd_parity                      809    EXIST::FUNCTION:DES
 DES_string_to_2keys                     810    EXIST::FUNCTION:DES
 DES_set_key                             808    EXIST::FUNCTION:DES
 DES_set_odd_parity                      809    EXIST::FUNCTION:DES
 DES_string_to_2keys                     810    EXIST::FUNCTION:DES

diff --git a/util/mkdef.pl b/util/mkdef.pl
index ea6655a8ec60436d56197254db18a4ca9f0eb100..b549a60d605735b6fd8297ae84b9aed6d0552ef2 100755 (executable)
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -320,7 +320,7 @@ $crypto.=" crypto/ts/ts.h";
 $crypto.=" crypto/rand/rand.h";
 $crypto.=" crypto/comp/comp.h" ; # unless $no_comp;
 $crypto.=" crypto/ocsp/ocsp.h";
 $crypto.=" crypto/rand/rand.h";
 $crypto.=" crypto/comp/comp.h" ; # unless $no_comp;
 $crypto.=" crypto/ocsp/ocsp.h";

-$crypto.=" crypto/ui/ui.h crypto/ui/ui_compat.h";
+$crypto.=" crypto/ui/ui.h";

 $crypto.=" crypto/krb5/krb5_asn.h";
 #$crypto.=" crypto/store/store.h";
 $crypto.=" crypto/pqueue/pqueue.h";
 $crypto.=" crypto/krb5/krb5_asn.h";
 #$crypto.=" crypto/store/store.h";
 $crypto.=" crypto/pqueue/pqueue.h";