summaryrefslogtreecommitdiffstats
path: root/src/lib/crypto/openssl
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-02-25 19:53:04 +0000
committerGreg Hudson <ghudson@mit.edu>2011-02-25 19:53:04 +0000
commit259a07f169b9a1188c3a9efb3a5fb1fb67b4b04d (patch)
treefdfbd5bf84ef9d78c19f02685e3cca54c023449d /src/lib/crypto/openssl
parentab0c0b3179d9d9e6e6a3c56a169109af1548eeed (diff)
downloadkrb5-259a07f169b9a1188c3a9efb3a5fb1fb67b4b04d.tar.gz
krb5-259a07f169b9a1188c3a9efb3a5fb1fb67b4b04d.tar.xz
krb5-259a07f169b9a1188c3a9efb3a5fb1fb67b4b04d.zip
Namespace-protect SHA-256 symbols. Build SHA-256 code independently of
whether Fortuna was selected. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24666 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/openssl')
-rw-r--r--src/lib/crypto/openssl/sha2/sha2.h6
-rw-r--r--src/lib/crypto/openssl/stubs.c12
2 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/crypto/openssl/sha2/sha2.h b/src/lib/crypto/openssl/sha2/sha2.h
index 0f61d5dc4..afc1d4660 100644
--- a/src/lib/crypto/openssl/sha2/sha2.h
+++ b/src/lib/crypto/openssl/sha2/sha2.h
@@ -31,8 +31,8 @@
#define _SHA2_DEFINED
-#define sha2Init SHA256_Init
-#define sha2Update SHA256_Update
-#define sha2Final SHA256_Final
+#define k5_sha256_init SHA256_Init
+#define k5_sha256_update SHA256_Update
+#define k5_sha256_final SHA256_Final
#endif /* _SHA2_DEFINED */
diff --git a/src/lib/crypto/openssl/stubs.c b/src/lib/crypto/openssl/stubs.c
index 220df388a..1ee4d7b35 100644
--- a/src/lib/crypto/openssl/stubs.c
+++ b/src/lib/crypto/openssl/stubs.c
@@ -39,9 +39,9 @@
*/
void krb5int_aes_enc_blk(void);
void krb5int_aes_enc_key(void);
-void sha2Final(void);
-void sha2Init(void);
-void sha2Update(void);
+void k5_sha256_final(void);
+void k5_sha256_init(void);
+void k5_sha256_update(void);
void krb5int_aes_enc_blk(void)
{
@@ -53,17 +53,17 @@ void krb5int_aes_enc_key(void)
abort();
}
-void sha2Final(void)
+void k5_sha256_final(void)
{
abort();
}
-void sha2Init(void)
+void k5_sha256_init(void)
{
abort();
}
-void sha2Update(void)
+void k5_sha256_update(void)
{
abort();
}