summaryrefslogtreecommitdiffstats
path: root/src/crypto
diff options
context:
space:
mode:
authorMichael Brown2007-07-28 23:55:31 +0200
committerMichael Brown2007-07-28 23:55:31 +0200
commite3484e26eba1ba36481d814b35f8561a0f4cb8a6 (patch)
tree2b0691c2aae17c8aca095d88ebcc172a7e06805c /src/crypto
parentEnsure clock line is in the idle state before asserting chip select. (diff)
parentMake has_key() a static inline, rather than omitting it altogether. (diff)
downloadipxe-e3484e26eba1ba36481d814b35f8561a0f4cb8a6.tar.gz
ipxe-e3484e26eba1ba36481d814b35f8561a0f4cb8a6.tar.xz
ipxe-e3484e26eba1ba36481d814b35f8561a0f4cb8a6.zip
Merge branch 'symcheck2'
Diffstat (limited to 'src/crypto')
-rw-r--r--src/crypto/axtls/aes.c4
-rw-r--r--src/crypto/axtls/crypto.h2
-rw-r--r--src/crypto/md5.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/src/crypto/axtls/aes.c b/src/crypto/axtls/aes.c
index 9154a5153..298e41932 100644
--- a/src/crypto/axtls/aes.c
+++ b/src/crypto/axtls/aes.c
@@ -238,6 +238,9 @@ void AES_set_key(AES_CTX *ctx, const uint8_t *key,
memcpy(ctx->iv, iv, 16);
}
+#if 0
+/** currently unused function **/
+
/**
* Change a key for decryption.
*/
@@ -256,6 +259,7 @@ void AES_convert_key(AES_CTX *ctx)
*k++ =w;
}
}
+#endif
/**
* Encrypt a byte sequence (with a block size 16) using the AES cipher.
diff --git a/src/crypto/axtls/crypto.h b/src/crypto/axtls/crypto.h
index f6277adcc..855282faa 100644
--- a/src/crypto/axtls/crypto.h
+++ b/src/crypto/axtls/crypto.h
@@ -54,7 +54,9 @@ void AES_set_key(AES_CTX *ctx, const uint8_t *key,
void AES_cbc_encrypt(AES_CTX *ctx, const uint8_t *msg,
uint8_t *out, int length);
void AES_cbc_decrypt(AES_CTX *ks, const uint8_t *in, uint8_t *out, int length);
+#if 0 /** currently unused function **/
void AES_convert_key(AES_CTX *ctx);
+#endif
/**************************************************************************
* RC4 declarations
diff --git a/src/crypto/md5.c b/src/crypto/md5.c
index 09378e20f..1fed24fcd 100644
--- a/src/crypto/md5.c
+++ b/src/crypto/md5.c
@@ -54,7 +54,7 @@ static u32 __md5step f4(u32 b, u32 c, u32 d)
return ( c ^ ( b | ~d ) );
}
-struct md5_step md5_steps[4] = {
+static struct md5_step md5_steps[4] = {
{
.f = f1,
.coefficient = 1,