Remove ui_compat (7cd6069c) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/crypto-lib.com

+1 −2

Original line number	Diff line number	Diff line
		@@ -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"
		$ 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,"+ -

crypto/symhacks.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -229,12 +229,6 @@
		# 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

crypto/ui/Makefile

+3 −10

Original line number	Diff line number	Diff line
		@@ -17,16 +17,13 @@ GENERAL=Makefile
		TEST=
		APPS=

		COMPATSRC= ui_compat.c
		COMPATOBJ= ui_compat.o

		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)

		EXHEADER= ui.h ui_compat.h
		EXHEADER= ui.h
		HEADER= $(EXHEADER) ui_locl.h

		ALL= $(GENERAL) $(SRC) $(HEADER)
		@@ -78,10 +75,6 @@ clean:

		# 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

crypto/ui/ui_compat.c

deleted100644 → 0

+0 −69

Original line number	Diff line number	Diff line
		/* 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);
		}

crypto/ui/ui_compat.h

deleted100644 → 0

+0 −88

Original line number	Diff line number	Diff line
		/* 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