Fix some style issues... (700b8145) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/speed.c

+13 −13

Original line number	Diff line number	Diff line
		@@ -1066,16 +1066,16 @@ static void KDF1_SHA1(const void in, size_t inlen, void *out,
		*outlen = SHA_DIGEST_LENGTH;
		return SHA1(in, inlen, out);
		}

		#endif /* ndef OPENSSL_NO_EC */


		static int run_benchmark(int async_jobs, int (loop_function)(void ), loopargs_t *loopargs)
		static int run_benchmark(int async_jobs,
		int (loop_function)(void ), loopargs_t *loopargs)
		{
		int job_op_count = 0;
		int total_op_count = 0;
		int num_inprogress = 0;
		int error = 0, i = 0, async = 0;
		int error = 0, i = 0, ret = 0;
		OSSL_ASYNC_FD job_fd = 0;
		size_t num_job_fds = 0;

		@@ -1086,10 +1086,10 @@ static int run_benchmark(int async_jobs, int (loop_function)(void ), loopargs_
		}

		for (i = 0; i < async_jobs && !error; i++) {
		async = ASYNC_start_job(&(loopargs[i].inprogress_job), loopargs[i].wait_ctx,
		ret = ASYNC_start_job(&loopargs[i].inprogress_job, loopargs[i].wait_ctx,
		&job_op_count, loop_function,
		(void *)(loopargs + i), sizeof(loopargs_t));
		switch (async) {
		switch (ret) {
		case ASYNC_PAUSE:
		++num_inprogress;
		break;
		@@ -1184,10 +1184,10 @@ static int run_benchmark(int async_jobs, int (loop_function)(void ), loopargs_
		continue;
		#endif

		async = ASYNC_start_job(&(loopargs[i].inprogress_job), loopargs[i].wait_ctx,
		&job_op_count, loop_function, (void *)(loopargs + i),
		sizeof(loopargs_t));
		switch (async) {
		ret = ASYNC_start_job(&loopargs[i].inprogress_job,
		loopargs[i].wait_ctx, &job_op_count, loop_function,
		(void *)(loopargs + i), sizeof(loopargs_t));
		switch (ret) {
		case ASYNC_PAUSE:
		break;
		case ASYNC_FINISH:

crypto/engine/eng_ctrl.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -203,14 +203,13 @@ int ENGINE_ctrl_cmd(ENGINE e, const char cmd_name,
		{
		int num;

		if ((e == NULL) \|\| (cmd_name == NULL)) {
		if (e == NULL \|\| cmd_name == NULL) {
		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD, ERR_R_PASSED_NULL_PARAMETER);
		return 0;
		}
		if ((e->ctrl == NULL) \|\| ((num = ENGINE_ctrl(e,
		ENGINE_CTRL_GET_CMD_FROM_NAME,
		0, (void *)cmd_name,
		NULL)) <= 0)) {
		if (e->ctrl == NULL
		\|\| (num = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FROM_NAME,
		0, (void *)cmd_name, NULL)) <= 0) {
		/*
		* If the command didn't have to be supported, we fake success.
		* This allows certain settings to be specified for multiple ENGINEs
		@@ -242,9 +241,8 @@ int ENGINE_ctrl_cmd_string(ENGINE e, const char cmd_name, const char *arg,
		long l;
		char *ptr;

		if ((e == NULL) \|\| (cmd_name == NULL)) {
		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING,
		ERR_R_PASSED_NULL_PARAMETER);
		if (e == NULL \|\| cmd_name == NULL) {
		ENGINEerr(ENGINE_F_ENGINE_CTRL_CMD_STRING, ERR_R_PASSED_NULL_PARAMETER);
		return 0;
		}
		if (e->ctrl == NULL

crypto/evp/e_chacha20_poly1305.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -345,9 +345,11 @@ static int chacha20_poly1305_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg,

		case EVP_CTRL_COPY:
		if (actx) {
		if ((((EVP_CIPHER_CTX *)ptr)->cipher_data =
		OPENSSL_memdup(actx,sizeof(*actx) + Poly1305_ctx_size()))
		== NULL) {
		EVP_CIPHER_CTX dst = (EVP_CIPHER_CTX )ptr;

		dst->cipher_data =
		OPENSSL_memdup(actx, sizeof(*actx) + Poly1305_ctx_size());
		if (dst->cipher_data == NULL) {
		EVPerr(EVP_F_CHACHA20_POLY1305_CTRL, EVP_R_COPY_ERROR);
		return 0;
		}