From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 3 Mar 2010 15:30:05 +0000 (+0000)
Subject: don't mix definitions and code
X-Git-Tag: OpenSSL_0_9_8n~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7786ed6a6417d8458ec445313f413f2c6713b72c;p=oweals%2Fopenssl.git

don't mix definitions and code
---

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index ba20ed65f0..eef1e2d814 100644
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -756,13 +756,13 @@ cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
 	kop.crk_iparams = 3;
 
 	if (cryptodev_asym(&kop, BN_num_bytes(m), r, 0, NULL)) {
-		printf("OCF asym process failed, Running in software\n");
 		const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+		printf("OCF asym process failed, Running in software\n");
 		ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
 
 	} else if (ECANCELED == kop.crk_status) {
-		printf("OCF hardware operation cancelled. Running in Software\n");
 		const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+		printf("OCF hardware operation cancelled. Running in Software\n");
 		ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
 	}
 	/* else cryptodev operation worked ok ==> ret = 1*/
@@ -810,13 +810,13 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
 	kop.crk_iparams = 6;
 
 	if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL)) {
-		printf("OCF asym process failed, running in Software\n");
 		const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+		printf("OCF asym process failed, running in Software\n");
 		ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
 
 	} else if (ECANCELED == kop.crk_status) {
-		printf("OCF hardware operation cancelled. Running in Software\n");
 		const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
+		printf("OCF hardware operation cancelled. Running in Software\n");
 		ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
 	}
 	/* else cryptodev operation worked ok ==> ret = 1*/