Run util/openssl-format-source -v -c .
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
		@@ -7,7 +7,7 @@
 | 
			
		||||
 * are met:
 | 
			
		||||
 *
 | 
			
		||||
 * 1. Redistributions of source code must retain the above copyright
 | 
			
		||||
 *    notice, this list of conditions and the following disclaimer. 
 | 
			
		||||
 *    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
 | 
			
		||||
@@ -53,64 +53,69 @@
 | 
			
		||||
 *
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
/* This file contains deprecated function(s) that are now wrappers to the new
 | 
			
		||||
 * version(s). */
 | 
			
		||||
/*
 | 
			
		||||
 * This file contains deprecated function(s) that are now wrappers to the new
 | 
			
		||||
 * version(s).
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#undef GENUINE_DSA
 | 
			
		||||
 | 
			
		||||
#ifdef GENUINE_DSA
 | 
			
		||||
/* Parameter generation follows the original release of FIPS PUB 186,
 | 
			
		||||
 * Appendix 2.2 (i.e. use SHA as defined in FIPS PUB 180) */
 | 
			
		||||
#define HASH    EVP_sha()
 | 
			
		||||
/*
 | 
			
		||||
 * Parameter generation follows the original release of FIPS PUB 186,
 | 
			
		||||
 * Appendix 2.2 (i.e. use SHA as defined in FIPS PUB 180)
 | 
			
		||||
 */
 | 
			
		||||
# define HASH    EVP_sha()
 | 
			
		||||
#else
 | 
			
		||||
/* Parameter generation follows the updated Appendix 2.2 for FIPS PUB 186,
 | 
			
		||||
 * also Appendix 2.2 of FIPS PUB 186-1 (i.e. use SHA as defined in
 | 
			
		||||
 * FIPS PUB 180-1) */
 | 
			
		||||
#define HASH    EVP_sha1()
 | 
			
		||||
#endif 
 | 
			
		||||
/*
 | 
			
		||||
 * Parameter generation follows the updated Appendix 2.2 for FIPS PUB 186,
 | 
			
		||||
 * also Appendix 2.2 of FIPS PUB 186-1 (i.e. use SHA as defined in FIPS PUB
 | 
			
		||||
 * 180-1)
 | 
			
		||||
 */
 | 
			
		||||
# define HASH    EVP_sha1()
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
static void *dummy=&dummy;
 | 
			
		||||
static void *dummy = &dummy;
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_SHA
 | 
			
		||||
 | 
			
		||||
#include <stdio.h>
 | 
			
		||||
#include <time.h>
 | 
			
		||||
#include "cryptlib.h"
 | 
			
		||||
#include <openssl/evp.h>
 | 
			
		||||
#include <openssl/bn.h>
 | 
			
		||||
#include <openssl/dsa.h>
 | 
			
		||||
#include <openssl/rand.h>
 | 
			
		||||
#include <openssl/sha.h>
 | 
			
		||||
# include <stdio.h>
 | 
			
		||||
# include <time.h>
 | 
			
		||||
# include "cryptlib.h"
 | 
			
		||||
# include <openssl/evp.h>
 | 
			
		||||
# include <openssl/bn.h>
 | 
			
		||||
# include <openssl/dsa.h>
 | 
			
		||||
# include <openssl/rand.h>
 | 
			
		||||
# include <openssl/sha.h>
 | 
			
		||||
 | 
			
		||||
#ifndef OPENSSL_NO_DEPRECATED
 | 
			
		||||
# ifndef OPENSSL_NO_DEPRECATED
 | 
			
		||||
DSA *DSA_generate_parameters(int bits,
 | 
			
		||||
		unsigned char *seed_in, int seed_len,
 | 
			
		||||
		int *counter_ret, unsigned long *h_ret,
 | 
			
		||||
		void (*callback)(int, int, void *),
 | 
			
		||||
		void *cb_arg)
 | 
			
		||||
	{
 | 
			
		||||
	BN_GENCB *cb;
 | 
			
		||||
	DSA *ret;
 | 
			
		||||
                             unsigned char *seed_in, int seed_len,
 | 
			
		||||
                             int *counter_ret, unsigned long *h_ret,
 | 
			
		||||
                             void (*callback) (int, int, void *),
 | 
			
		||||
                             void *cb_arg)
 | 
			
		||||
{
 | 
			
		||||
    BN_GENCB *cb;
 | 
			
		||||
    DSA *ret;
 | 
			
		||||
 | 
			
		||||
	if ((ret=DSA_new()) == NULL) return NULL;
 | 
			
		||||
	cb = BN_GENCB_new();
 | 
			
		||||
	if(!cb)
 | 
			
		||||
		{
 | 
			
		||||
		DSA_free(ret);
 | 
			
		||||
		return NULL;
 | 
			
		||||
		}
 | 
			
		||||
    if ((ret = DSA_new()) == NULL)
 | 
			
		||||
        return NULL;
 | 
			
		||||
    cb = BN_GENCB_new();
 | 
			
		||||
    if (!cb) {
 | 
			
		||||
        DSA_free(ret);
 | 
			
		||||
        return NULL;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
	BN_GENCB_set_old(cb, callback, cb_arg);
 | 
			
		||||
    BN_GENCB_set_old(cb, callback, cb_arg);
 | 
			
		||||
 | 
			
		||||
	if(DSA_generate_parameters_ex(ret, bits, seed_in, seed_len,
 | 
			
		||||
				counter_ret, h_ret, cb))
 | 
			
		||||
		{
 | 
			
		||||
		BN_GENCB_free(cb);
 | 
			
		||||
		return ret;
 | 
			
		||||
		}
 | 
			
		||||
	BN_GENCB_free(cb);
 | 
			
		||||
	DSA_free(ret);
 | 
			
		||||
	return NULL;
 | 
			
		||||
	}
 | 
			
		||||
#endif
 | 
			
		||||
    if (DSA_generate_parameters_ex(ret, bits, seed_in, seed_len,
 | 
			
		||||
                                   counter_ret, h_ret, cb)) {
 | 
			
		||||
        BN_GENCB_free(cb);
 | 
			
		||||
        return ret;
 | 
			
		||||
    }
 | 
			
		||||
    BN_GENCB_free(cb);
 | 
			
		||||
    DSA_free(ret);
 | 
			
		||||
    return NULL;
 | 
			
		||||
}
 | 
			
		||||
# endif
 | 
			
		||||
#endif
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user