fix warnings (af1cb47e) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/ecdsa/ecdsa.h

+3 −2

Original line number	Diff line number	Diff line
		@@ -134,10 +134,10 @@ int ECDSA_check_key(ECDSA *ecdsa);
		const ECDSA_METHOD *ECDSA_OpenSSL(void);

		void ECDSA_set_default_method(const ECDSA_METHOD *);
		const ECDSA_METHOD *ECDSA_get_default_openssl_method(void);
		const ECDSA_METHOD *ECDSA_get_default_method(void);
		int ECDSA_set_method(ECDSA , const ECDSA_METHOD );

		ECDSA *ECDSA_new();
		ECDSA *ECDSA_new(void);
		ECDSA ECDSA_new_method(ENGINE engine);
		int ECDSA_size(const ECDSA *);
		int ECDSA_sign_setup(ECDSA ecdsa, BN_CTX ctx, BIGNUM kinv, BIGNUM rp);
		@@ -190,6 +190,7 @@ int i2d_ECDSAPublicKey(ECDSA a, unsigned char *out);
		/* The following lines are auto generated by the script mkerr.pl. Any changes
		* made after this point may be overwritten when the script is next run.
		*/
		void ERR_load_ECDSA_strings(void);

		/* Error codes for the ECDSA functions. */

crypto/ecdsa/ecs_asn1.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,8 @@ ASN1_SEQUENCE(X9_62_FIELDID) = {
		ASN1_SIMPLE(X9_62_FIELDID, parameters, ASN1_ANY)
		} ASN1_SEQUENCE_END(X9_62_FIELDID)

		DECLARE_ASN1_FUNCTIONS_const(X9_62_FIELDID)
		DECLARE_ASN1_ENCODE_FUNCTIONS_const(X9_62_FIELDID, X9_62_FIELDID)
		IMPLEMENT_ASN1_FUNCTIONS_const(X9_62_FIELDID)

		ASN1_SEQUENCE(X9_62_CURVE) = {
		@@ -81,6 +83,8 @@ ASN1_SEQUENCE(X9_62_CURVE) = {
		ASN1_OPT(X9_62_CURVE, seed, ASN1_BIT_STRING)
		} ASN1_SEQUENCE_END(X9_62_CURVE)

		DECLARE_ASN1_FUNCTIONS_const(X9_62_CURVE)
		DECLARE_ASN1_ENCODE_FUNCTIONS_const(X9_62_CURVE, X9_62_CURVE)
		IMPLEMENT_ASN1_FUNCTIONS_const(X9_62_CURVE)

		ASN1_SEQUENCE(X9_62_EC_PARAMETERS) = {
		@@ -92,6 +96,8 @@ ASN1_SEQUENCE(X9_62_EC_PARAMETERS) = {
		ASN1_SIMPLE(X9_62_EC_PARAMETERS, cofactor, ASN1_INTEGER)
		} ASN1_SEQUENCE_END(X9_62_EC_PARAMETERS)

		DECLARE_ASN1_FUNCTIONS_const(X9_62_EC_PARAMETERS)
		DECLARE_ASN1_ENCODE_FUNCTIONS_const(X9_62_EC_PARAMETERS, X9_62_EC_PARAMETERS)
		IMPLEMENT_ASN1_FUNCTIONS_const(X9_62_EC_PARAMETERS)

		ASN1_CHOICE(EC_PARAMETERS) = {
		@@ -100,6 +106,8 @@ ASN1_CHOICE(EC_PARAMETERS) = {
		ASN1_SIMPLE(EC_PARAMETERS, value.implicitlyCA, ASN1_NULL)
		} ASN1_CHOICE_END(EC_PARAMETERS)

		DECLARE_ASN1_FUNCTIONS_const(EC_PARAMETERS)
		DECLARE_ASN1_ENCODE_FUNCTIONS_const(EC_PARAMETERS, EC_PARAMETERS)
		IMPLEMENT_ASN1_FUNCTIONS_const(EC_PARAMETERS)

		ASN1_SEQUENCE(ECDSAPrivateKey) = {
		@@ -109,6 +117,8 @@ ASN1_SEQUENCE(ECDSAPrivateKey) = {
		ASN1_SIMPLE(ECDSAPrivateKey, priv_key, BIGNUM)
		} ASN1_SEQUENCE_END(ECDSAPrivateKey)

		DECLARE_ASN1_FUNCTIONS_const(ECDSAPrivateKey)
		DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECDSAPrivateKey, ecdsaPrivateKey)
		IMPLEMENT_ASN1_ALLOC_FUNCTIONS_fname(ECDSAPrivateKey, ECDSAPrivateKey, ECDSAPrivateKey)
		IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ECDSAPrivateKey, ECDSAPrivateKey, ecdsaPrivateKey)

		@@ -122,6 +132,7 @@ ASN1_CHOICE(ECDSAPublicKey) = {
		ASN1_EX_COMBINE(0, 0, ecdsa_pub_internal)
		} ASN1_CHOICE_END_selector(ECDSAPrivateKey, ECDSAPublicKey, write_params)

		DECLARE_ASN1_ENCODE_FUNCTIONS_const(ECDSAPrivateKey, ecdsaPublicKey)
		IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ECDSAPrivateKey, ECDSAPublicKey, ecdsaPublicKey)

crypto/ecdsa/ecs_gen.c

+3 −55

Original line number	Diff line number	Diff line
		@@ -52,62 +52,9 @@
		* Hudson (tjh@cryptsoft.com).
		*
		*/
		/* 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.]
		/* TODO: implementation of ecdsa parameter generation
		*/
		#if 0
		#include <stdio.h>
		#include <time.h>
		#include "cryptlib.h"
		@@ -131,3 +78,4 @@ ECDSA *ECDSA_generate_parameters(int bits,
		#ifdef __cplusplus
		}
		#endif
		#endif