New utility pkeyparam. Enhance and bugfix algorithm specific parameter (3e4585c8) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

CHANGES

+3 −2

Original line number	Diff line number	Diff line
		@@ -4,8 +4,9 @@

		Changes between 0.9.8a and 0.9.9 [xx XXX xxxx]

		*) New utility 'pkey'. This is similar to algorithm specific utilities
		such as 'rsa', 'dsa' etc except it processes any key type.
		*) New utilities pkey and pkeyparam. These are similar to algorithm specific
		utilities such as rsa, dsa, dsaparam etc except they processes any key
		type.
		[Steve Henson]

		*) Transfer public key printing routines to EVP_PKEY_ASN1_METHOD. New

apps/Makefile

+3 −3

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ E_EXE= verify asn1pars req dgst dh dhparam enc passwd gendh errstr \
		ca crl rsa rsautl dsa dsaparam ec ecparam \
		x509 genrsa gendsa s_server s_client speed \
		s_time version pkcs7 crl2pkcs7 sess_id ciphers nseq pkcs12 \
		pkcs8 pkey spkac smime rand engine ocsp prime ts
		pkcs8 pkey pkeyparam spkac smime rand engine ocsp prime ts

		PROGS= $(PROGRAM).c

		@@ -55,7 +55,7 @@ E_OBJ= verify.o asn1pars.o req.o dgst.o dh.o dhparam.o enc.o passwd.o gendh.o er
		rsa.o rsautl.o dsa.o dsaparam.o ec.o ecparam.o \
		x509.o genrsa.o gendsa.o s_server.o s_client.o speed.o \
		s_time.o $(A_OBJ) $(S_OBJ) $(RAND_OBJ) version.o sess_id.o \
		ciphers.o nseq.o pkcs12.o pkcs8.o pkey.o \
		ciphers.o nseq.o pkcs12.o pkcs8.o pkey.o pkeyparam.o \
		spkac.o smime.o rand.o engine.o ocsp.o prime.o ts.o

		E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.c \
		@@ -63,7 +63,7 @@ E_SRC= verify.c asn1pars.c req.c dgst.c dh.c enc.c passwd.c gendh.c errstr.c ca.
		rsa.c rsautl.c dsa.c dsaparam.c ec.c ecparam.c \
		x509.c genrsa.c gendsa.c s_server.c s_client.c speed.c \
		s_time.c $(A_SRC) $(S_SRC) $(RAND_SRC) version.c sess_id.c \
		ciphers.c nseq.c pkcs12.c pkcs8.c pkey.c \
		ciphers.c nseq.c pkcs12.c pkcs8.c pkey.c pkeyparam.c \
		spkac.c smime.c rand.c engine.c ocsp.c prime.c ts.c

		SRC=$(E_SRC)

apps/pkey.c

+9 −9

Original line number	Diff line number	Diff line
		/* pkey.c */
		/* apps/pkey.c */
		/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
		* project 2006
		*/
		@@ -81,6 +81,7 @@ int MAIN(int argc, char **argv)
		#ifndef OPENSSL_NO_ENGINE
		char *engine=NULL;
		#endif
		int ret = 1;

		if (bio_err == NULL)
		bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
		@@ -203,7 +204,7 @@ int MAIN(int argc, char **argv)
		if (!app_passwd(bio_err, passargin, passargout, &passin, &passout))
		{
		BIO_printf(bio_err, "Error getting passwords\n");
		return 1;
		goto end;
		}

		if (outfile)
		@@ -212,7 +213,7 @@ int MAIN(int argc, char **argv)
		{
		BIO_printf(bio_err,
		"Can't open output file %s\n", outfile);
		return (1);
		goto end;
		}
		}
		else
		@@ -233,10 +234,7 @@ int MAIN(int argc, char **argv)
		pkey = load_key(bio_err, infile, informat, 1,
		passin, e, "key");
		if (!pkey)
		{
		BIO_free_all(out);
		return 1;
		}
		goto end;

		if (!noout)
		{
		@@ -258,7 +256,7 @@ int MAIN(int argc, char **argv)
		else
		{
		BIO_printf(bio_err, "Bad format specified for key\n");
		return (1);
		goto end;
		}

		}
		@@ -271,6 +269,8 @@ int MAIN(int argc, char **argv)
		EVP_PKEY_print_private(out, pkey, 0, NULL);
		}

		ret = 0;

		end:
		EVP_PKEY_free(pkey);
		BIO_free_all(out);
		@@ -280,5 +280,5 @@ int MAIN(int argc, char **argv)
		if (passout)
		OPENSSL_free(passout);

		return (0);
		return ret;
		}

apps/pkeyparam.c

0 → 100644

+197 −0

Original line number	Diff line number	Diff line
		/* apps/pkeyparam.c */
		/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
		* project 2006
		*/
		/* ====================================================================
		* Copyright (c) 2006 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
		* licensing@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 <stdio.h>
		#include <string.h>
		#include "apps.h"
		#include <openssl/pem.h>
		#include <openssl/err.h>
		#include <openssl/evp.h>

		#define PROG pkeyparam_main

		int MAIN(int, char **);

		int MAIN(int argc, char **argv)
		{
		ENGINE *e = NULL;
		char *args, infile = NULL, *outfile = NULL;
		BIO in = NULL, out = NULL;
		int text = 0, noout = 0;
		EVP_PKEY *pkey=NULL;
		int badarg = 0;
		#ifndef OPENSSL_NO_ENGINE
		char *engine=NULL;
		#endif
		int ret = 1;

		if (bio_err == NULL)
		bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);

		if (!load_config(bio_err, NULL))
		goto end;

		ERR_load_crypto_strings();
		OpenSSL_add_all_algorithms();
		args = argv + 1;
		while (!badarg && args && args[0] == '-')
		{
		if (!strcmp (*args, "-in"))
		{
		if (args[1])
		{
		args++;
		infile = *args;
		}
		else badarg = 1;
		}
		else if (!strcmp (*args, "-out"))
		{
		if (args[1])
		{
		args++;
		outfile = *args;
		}
		else badarg = 1;
		}
		#ifndef OPENSSL_NO_ENGINE
		else if (strcmp(*args,"-engine") == 0)
		{
		if (!args[1]) goto bad;
		engine= *(++args);
		}
		#endif

		else if (strcmp(*args,"-text") == 0)
		text=1;
		else if (strcmp(*args,"-noout") == 0)
		noout=1;
		args++;
		}

		if (badarg)
		{
		bad:
		BIO_printf(bio_err, "Usage pkeyparam [options]\n");
		BIO_printf(bio_err, "where options are\n");
		BIO_printf(bio_err, "-in file input file\n");
		BIO_printf(bio_err, "-out file output file\n");
		#ifndef OPENSSL_NO_ENGINE
		BIO_printf(bio_err, "-engine e use engine e, possibly a hardware device.\n");
		#endif
		return 1;
		}

		#ifndef OPENSSL_NO_ENGINE
		e = setup_engine(bio_err, engine, 0);
		#endif

		if (infile)
		{
		if (!(in = BIO_new_file (infile, "r")))
		{
		BIO_printf(bio_err,
		"Can't open input file %s\n", infile);
		goto end;
		}
		}
		else
		in = BIO_new_fp (stdin, BIO_NOCLOSE);

		if (outfile)
		{
		if (!(out = BIO_new_file (outfile, "w")))
		{
		BIO_printf(bio_err,
		"Can't open output file %s\n", outfile);
		goto end;
		}
		}
		else
		{
		out = BIO_new_fp (stdout, BIO_NOCLOSE);
		#ifdef OPENSSL_SYS_VMS
		{
		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
		out = BIO_push(tmpbio, out);
		}
		#endif
		}

		pkey = PEM_read_bio_Parameters(in, NULL);
		if (!pkey)
		{
		BIO_printf(bio_err, "Error reading paramters\n");
		ERR_print_errors(bio_err);
		goto end;
		}

		if (!noout)
		PEM_write_bio_Parameters(out,pkey);

		if (text)
		EVP_PKEY_print_params(out, pkey, 0, NULL);

		ret = 0;

		end:
		EVP_PKEY_free(pkey);
		BIO_free_all(out);
		BIO_free(in);

		return ret;
		}

apps/progs.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ extern int nseq_main(int argc,char *argv[]);
		extern int pkcs12_main(int argc,char *argv[]);
		extern int pkcs8_main(int argc,char *argv[]);
		extern int pkey_main(int argc,char *argv[]);
		extern int pkeyparam_main(int argc,char *argv[]);
		extern int spkac_main(int argc,char *argv[]);
		extern int smime_main(int argc,char *argv[]);
		extern int rand_main(int argc,char *argv[]);
		@@ -122,6 +123,7 @@ FUNCTION functions[] = {
		#endif
		{FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main},
		{FUNC_TYPE_GENERAL,"pkey",pkey_main},
		{FUNC_TYPE_GENERAL,"pkeyparam",pkeyparam_main},
		{FUNC_TYPE_GENERAL,"spkac",spkac_main},
		{FUNC_TYPE_GENERAL,"smime",smime_main},
		{FUNC_TYPE_GENERAL,"rand",rand_main},