No fprintf in the txt_db component (51b04a61) · Commits · CYBER - Cyber Security / TS 103 523 MSP / ETS / ETS OpenSSL

crypto/conf/cnf_save.c

deleted100644 → 0

+0 −104

Original line number	Diff line number	Diff line
		/* crypto/conf/cnf_save.c */
		/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
		* All rights reserved.
		*
		* This package is an SSL implementation written
		* by Eric Young (eay@cryptsoft.com).
		* The implementation was written so as to conform with Netscapes SSL.
		*
		* This library is free for commercial and non-commercial use as long as
		* the following conditions are aheared to. The following conditions
		* apply to all code found in this distribution, be it the RC4, RSA,
		* lhash, DES, etc., code; not just the SSL code. The SSL documentation
		* included with this distribution is covered by the same copyright terms
		* except that the holder is Tim Hudson (tjh@cryptsoft.com).
		*
		* Copyright remains Eric Young's, and as such any Copyright notices in
		* the code are not to be removed.
		* If this package is used in a product, Eric Young should be given attribution
		* as the author of the parts of the library used.
		* This can be in the form of a textual message at program startup or
		* in documentation (online or textual) provided with the package.
		*
		* 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 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 acknowledgement:
		* "This product includes cryptographic software written by
		* Eric Young (eay@cryptsoft.com)"
		* The word 'cryptographic' can be left out if the rouines from the library
		* being used are not cryptographic related :-).
		* 4. If you include any Windows specific code (or a derivative thereof) from
		* the apps directory (application code) you must include an acknowledgement:
		* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
		*
		* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
		* ANY EXPRESS 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 AUTHOR OR 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.
		*
		* The licence and distribution terms for any publically available version or
		* derivative of this code cannot be changed. i.e. this code cannot simply be
		* copied and put under another distribution licence
		* [including the GNU Public Licence.]
		*/

		#include <stdio.h>
		#include <openssl/conf.h>

		static void print_conf(CONF_VALUE *cv);
		static IMPLEMENT_LHASH_DOALL_FN(print_conf, CONF_VALUE *);

		main()
		{
		LHASH *conf;
		long l;

		conf = CONF_load(NULL, "../../apps/openssl.cnf", &l);
		if (conf == NULL) {
		fprintf(stderr, "error loading config, line %ld\n", l);
		exit(1);
		}

		lh_doall(conf, LHASH_DOALL_FN(print_conf));
		}

		static void print_conf(CONF_VALUE *cv)
		{
		int i;
		CONF_VALUE *v;
		char *section;
		char *name;
		char *value;
		STACK *s;

		/* If it is a single entry, return */

		if (cv->name != NULL)
		return;

		printf("[ %s ]\n", cv->section);
		s = (STACK *) cv->value;

		for (i = 0; i < sk_num(s); i++) {
		v = (CONF_VALUE *)sk_value(s, i);
		section = (v->section == NULL) ? "None" : v->section;
		name = (v->name == NULL) ? "None" : v->name;
		value = (v->value == NULL) ? "None" : v->value;
		printf("%s=%s\n", name, value);
		}
		printf("\n");
		}

crypto/txt_db/txt_db.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -155,11 +155,7 @@ TXT_DB TXT_DB_read(BIO in, int num)
		}
		*(p++) = '\0';
		if ((n != num) \|\| (*f != '\0')) {
		#if !defined(OPENSSL_NO_STDIO) /* temporary fix :-( */
		fprintf(stderr,
		"wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",
		ln, num, n, f);
		#endif
		ret->error = DB_ERROR_WRONG_NUM_FIELDS;
		goto err;
		}
		pp[n] = p;

include/openssl/txt_db.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@
		# define DB_ERROR_INDEX_OUT_OF_RANGE 3
		# define DB_ERROR_NO_INDEX 4
		# define DB_ERROR_INSERT_INDEX_CLASH 5
		# define DB_ERROR_WRONG_NUM_FIELDS 6

		#ifdef __cplusplus
		extern "C" {

crypto/conf/test.c→test/conftest.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -58,14 +58,16 @@

		#include <stdio.h>
		#include <stdlib.h>
		#include <openssl/lhash.h>
		#include <openssl/conf.h>
		#include <openssl/err.h>

		int
		main()
		{
		LHASH *conf;
		long eline;
		char s, s2;
		char *s;

		#ifdef USE_WIN32
		CONF_set_default_method(CONF_WIN32);
		@@ -93,5 +95,5 @@ main()
		printf("---------------------------- DUMP ------------------------\n");
		CONF_dump_fp(conf, stdout);

		exit(0);
		return 0;
		}

Admin message