From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Sun, 16 Aug 2015 17:34:15 +0000 (-0400)
Subject: Fix capitalization for sha1_ctx
X-Git-Tag: release_3_0_10~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f3ae357f8fc37ea862ceaf5c0938d94db93a2ff;p=thirdparty%2Ffreeradius-server.git

Fix capitalization for sha1_ctx
---

diff --git a/src/include/sha1.h b/src/include/sha1.h
index c6a71880e66..86c3d9fbfe0 100644
--- a/src/include/sha1.h
+++ b/src/include/sha1.h
@@ -18,22 +18,22 @@ typedef struct {
     uint32_t state[5];
     uint32_t count[2];
     uint8_t buffer[64];
-} fr_SHA1_CTX;
+} fr_sha1_ctx;
 
 void fr_sha1_transform(uint32_t state[5], uint8_t const buffer[64]);
-void fr_sha1_init(fr_SHA1_CTX *context);
-void fr_sha1_update(fr_SHA1_CTX *context, uint8_t const *data, size_t len);
-void fr_sha1_final(uint8_t digest[20], fr_SHA1_CTX *context);
+void fr_sha1_init(fr_sha1_ctx *context);
+void fr_sha1_update(fr_sha1_ctx *context, uint8_t const *data, size_t len);
+void fr_sha1_final(uint8_t digest[20], fr_sha1_ctx *context);
 
 /*
  * this version implements a raw SHA1 transform, no length is appended,
  * nor any 128s out to the block size.
  */
-void fr_sha1_final_no_len(uint8_t digest[20], fr_SHA1_CTX* context);
+void fr_sha1_final_no_len(uint8_t digest[20], fr_sha1_ctx* context);
 
 #else  /* WITH_OPENSSL_SHA1 */
 USES_APPLE_DEPRECATED_API
-#define fr_SHA1_CTX	SHA_CTX
+#define fr_sha1_ctx	SHA_CTX
 #define fr_sha1_init	SHA1_Init
 #define fr_sha1_update	SHA1_Update
 #define fr_sha1_final	SHA1_Final
diff --git a/src/lib/hmacsha1.c b/src/lib/hmacsha1.c
index ec33e54d255..c3cbd87a2c1 100644
--- a/src/lib/hmacsha1.c
+++ b/src/lib/hmacsha1.c
@@ -28,7 +28,7 @@ unsigned int sha1_data_problems = 0;
 void fr_hmac_sha1(uint8_t digest[SHA1_DIGEST_LENGTH], uint8_t const *text, size_t text_len,
 		  uint8_t const *key, size_t key_len)
 {
-	fr_SHA1_CTX context;
+	fr_sha1_ctx context;
 	uint8_t k_ipad[65];    /* inner padding - key XORd with ipad */
 	uint8_t k_opad[65];    /* outer padding - key XORd with opad */
 	uint8_t tk[20];
@@ -36,7 +36,7 @@ void fr_hmac_sha1(uint8_t digest[SHA1_DIGEST_LENGTH], uint8_t const *text, size_
 	/* if key is longer than 64 bytes reset it to key=SHA1(key) */
 	if (key_len > 64) {
 
-		fr_SHA1_CTX      tctx;
+		fr_sha1_ctx      tctx;
 
 		fr_sha1_init(&tctx);
 		fr_sha1_update(&tctx, key, key_len);
diff --git a/src/lib/sha1.c b/src/lib/sha1.c
index f99248e1781..59545bb6f5e 100644
--- a/src/lib/sha1.c
+++ b/src/lib/sha1.c
@@ -91,7 +91,7 @@ void fr_sha1_transform(uint32_t state[5], uint8_t const buffer[64])
 
 /* fr_sha1_init - Initialize new context */
 
-void fr_sha1_init(fr_SHA1_CTX* context)
+void fr_sha1_init(fr_sha1_ctx* context)
 {
 	/* SHA1 initialization constants */
 	context->state[0] = 0x67452301;
@@ -103,7 +103,7 @@ void fr_sha1_init(fr_SHA1_CTX* context)
 }
 
 /* Run your data through this. */
-void fr_sha1_update(fr_SHA1_CTX *context,uint8_t const *data, size_t len)
+void fr_sha1_update(fr_sha1_ctx *context,uint8_t const *data, size_t len)
 {
 	unsigned int i, j;
 
@@ -129,7 +129,7 @@ void fr_sha1_update(fr_SHA1_CTX *context,uint8_t const *data, size_t len)
 
 /* Add padding and return the message digest. */
 
-void fr_sha1_final(uint8_t digest[20], fr_SHA1_CTX *context)
+void fr_sha1_final(uint8_t digest[20], fr_sha1_ctx *context)
 {
 	uint32_t i, j;
 	uint8_t finalcount[8];
@@ -162,7 +162,7 @@ void fr_sha1_final(uint8_t digest[20], fr_SHA1_CTX *context)
 #  endif
 }
 
-void fr_sha1_final_no_len(uint8_t digest[20], fr_SHA1_CTX *context)
+void fr_sha1_final_no_len(uint8_t digest[20], fr_sha1_ctx *context)
 {
 	uint32_t i, j;
 
diff --git a/src/modules/rlm_cram/rlm_cram.c b/src/modules/rlm_cram/rlm_cram.c
index e5ba4eb87e8..c7a667ac2ba 100644
--- a/src/modules/rlm_cram/rlm_cram.c
+++ b/src/modules/rlm_cram/rlm_cram.c
@@ -104,7 +104,7 @@ static void calc_sha1_digest(uint8_t *buffer, uint8_t const *challenge,
 {
 	uint8_t buf[1024];
 	int i;
-	fr_SHA1_CTX context;
+	fr_sha1_ctx context;
 
 	memset(buf, 0, 1024);
 	memset(buf, 0x36, 64);
diff --git a/src/modules/rlm_eap/libeap/eapcrypto.c b/src/modules/rlm_eap/libeap/eapcrypto.c
index 9c1c06d8cf4..f57714b6df9 100644
--- a/src/modules/rlm_eap/libeap/eapcrypto.c
+++ b/src/modules/rlm_eap/libeap/eapcrypto.c
@@ -36,7 +36,7 @@ RCSID("$Id$")
 
 void eapsim_calculate_keys(struct eapsim_keys *ek)
 {
-	fr_SHA1_CTX context;
+	fr_sha1_ctx context;
 	uint8_t fk[160];
 	unsigned char buf[256];
 	unsigned char *p;
diff --git a/src/modules/rlm_eap/libeap/fips186prf.c b/src/modules/rlm_eap/libeap/fips186prf.c
index 4e17171754f..2002c62ccff 100644
--- a/src/modules/rlm_eap/libeap/fips186prf.c
+++ b/src/modules/rlm_eap/libeap/fips186prf.c
@@ -99,7 +99,7 @@ static void onesixty_add_mod(onesixty *sum, onesixty *a, onesixty *b)
  */
 void fips186_2prf(uint8_t mk[20], uint8_t finalkey[160])
 {
-	fr_SHA1_CTX context;
+	fr_sha1_ctx context;
 	int j;
 	onesixty xval, xkey, w_0, w_1, sum, one;
 	uint8_t *f;
diff --git a/src/modules/rlm_expr/rlm_expr.c b/src/modules/rlm_expr/rlm_expr.c
index 4ba19d58ccd..7eda6d130cf 100644
--- a/src/modules/rlm_expr/rlm_expr.c
+++ b/src/modules/rlm_expr/rlm_expr.c
@@ -970,7 +970,7 @@ static ssize_t sha1_xlat(UNUSED void *instance, REQUEST *request,
 	uint8_t digest[20];
 	ssize_t i, len, inlen;
 	uint8_t const *p;
-	fr_SHA1_CTX ctx;
+	fr_sha1_ctx ctx;
 
 	/*
 	 *      We need room for at least one octet of output.
diff --git a/src/modules/rlm_mschap/mschap.c b/src/modules/rlm_mschap/mschap.c
index b4236e06f67..4e088ed9621 100644
--- a/src/modules/rlm_mschap/mschap.c
+++ b/src/modules/rlm_mschap/mschap.c
@@ -71,7 +71,7 @@ void mschap_challenge_hash(uint8_t const *peer_challenge,
 			    uint8_t const *auth_challenge,
 			    char const *user_name, uint8_t *challenge )
 {
-	fr_SHA1_CTX Context;
+	fr_sha1_ctx Context;
 	uint8_t hash[20];
 
 	fr_sha1_init(&Context);
@@ -94,7 +94,7 @@ void mschap_auth_response(char const *username,
 			  uint8_t const *peer_challenge, uint8_t const *auth_challenge,
 			  char *response)
 {
-	fr_SHA1_CTX Context;
+	fr_sha1_ctx Context;
 	static const uint8_t magic1[39] =
 	{0x4D, 0x61, 0x67, 0x69, 0x63, 0x20, 0x73, 0x65, 0x72, 0x76,
 	 0x65, 0x72, 0x20, 0x74, 0x6F, 0x20, 0x63, 0x6C, 0x69, 0x65,
diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index a9d4c408f43..2335c8d1dc2 100644
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -1266,7 +1266,7 @@ static void mppe_GetMasterKey(uint8_t const *nt_hashhash,uint8_t const *nt_respo
 			      uint8_t *masterkey)
 {
        uint8_t digest[20];
-       fr_SHA1_CTX Context;
+       fr_sha1_ctx Context;
 
        fr_sha1_init(&Context);
        fr_sha1_update(&Context,nt_hashhash,NT_DIGEST_LENGTH);
@@ -1283,7 +1283,7 @@ static void mppe_GetAsymmetricStartKey(uint8_t *masterkey,uint8_t *sesskey,
 {
        uint8_t digest[20];
        const uint8_t *s;
-       fr_SHA1_CTX Context;
+       fr_sha1_ctx Context;
 
        memset(digest,0,20);
 
diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index baedeb77ed0..75afbdbe375 100644
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -623,7 +623,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_auth_smd5(rlm_pap_t *inst, REQUEST *requ
 
 static rlm_rcode_t CC_HINT(nonnull) pap_auth_sha(rlm_pap_t *inst, REQUEST *request, VALUE_PAIR *vp)
 {
-	fr_SHA1_CTX sha1_context;
+	fr_sha1_ctx sha1_context;
 	uint8_t digest[128];
 
 	RDEBUG("Comparing with \"known-good\" SHA-Password");
@@ -651,7 +651,7 @@ static rlm_rcode_t CC_HINT(nonnull) pap_auth_sha(rlm_pap_t *inst, REQUEST *reque
 
 static rlm_rcode_t CC_HINT(nonnull) pap_auth_ssha(rlm_pap_t *inst, REQUEST *request, VALUE_PAIR *vp)
 {
-	fr_SHA1_CTX sha1_context;
+	fr_sha1_ctx sha1_context;
 	uint8_t digest[128];
 
 	RDEBUG("Comparing with \"known-good\" SSHA-Password");