4 files changed, 0 insertions, 17 deletions
diff --git a/src/Common/Crypto.h b/src/Common/Crypto.h
index f183a436..e66ac18c 100644
--- a/src/Common/Crypto.h
+++ b/src/Common/Crypto.h
@@ -62,9 +62,6 @@ enum
 #define RIPEMD160_BLOCKSIZE             64
 #define RIPEMD160_DIGESTSIZE    20
-#define SHA1_BLOCKSIZE                  64      
-#define SHA1_DIGESTSIZE                 20
 #define SHA512_BLOCKSIZE                128
 #define SHA512_DIGESTSIZE               64
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index b40a41cd..092c8c6f 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -4353,7 +4353,6 @@ static BOOL PerformBenchmark(HWND hwndDlg)
                BYTE *digest [MAX_DIGESTSIZE];
                WHIRLPOOL_CTX   wctx;
                RMD160_CTX              rctx;
-                sha1_ctx                sctx;
                sha512_ctx              s2ctx;
                int hid;
@@ -4364,11 +4363,6 @@ static BOOL PerformBenchmark(HWND hwndDlg)
                        switch (hid)
                        {
-                        case SHA1:
-                                sha1_begin (&sctx);
-                                sha1_hash (lpTestBuffer, benchmarkBufferSize, &sctx);
-                                sha1_end ((unsigned char *) digest, &sctx);
-                                break;
                        case SHA512:
                                sha512_begin (&s2ctx);
@@ -4424,10 +4418,6 @@ static BOOL PerformBenchmark(HWND hwndDlg)
                        {
                                switch (thid)
                                {
-                                case SHA1:
-                                        /* PKCS-5 test with HMAC-SHA-1 used as the PRF */
-                                        derive_key_sha1 ("passphrase-1234567890", 21, tmp_salt, 64, get_pkcs5_iteration_count(thid, FALSE), dk, MASTER_KEYDATA_SIZE);
-                                        break;
                                case SHA512:
                                        /* PKCS-5 test with HMAC-SHA-512 used as the PRF */
diff --git a/src/Common/Pkcs5.h b/src/Common/Pkcs5.h
index 5a286fb5..148a3e2d 100644
--- a/src/Common/Pkcs5.h
+++ b/src/Common/Pkcs5.h
@@ -22,9 +22,6 @@ extern "C"
 void hmac_sha512 (char *k, int lk, char *d, int ld, char *out, int t);
 void derive_u_sha512 (char *pwd, int pwd_len, char *salt, int salt_len, int iterations, char *u, int b);
 void derive_key_sha512 (char *pwd, int pwd_len, char *salt, int salt_len, int iterations, char *dk, int dklen);
-void hmac_sha1 (char *k, int lk, char *d, int ld, char *out, int t);
-void derive_u_sha1 (char *pwd, int pwd_len, char *salt, int salt_len, int iterations, char *u, int b);
-void derive_key_sha1 (char *pwd, int pwd_len, char *salt, int salt_len, int iterations, char *dk, int dklen);
 void hmac_ripemd160 (char *key, int keylen, char *input, int len, char *digest);
 void derive_u_ripemd160 (BOOL bNotTest, char *pwd, int pwd_len, char *salt, int salt_len, int iterations, char *u, int b);
 void derive_key_ripemd160 (BOOL bNotTest, char *pwd, int pwd_len, char *salt, int salt_len, int iterations, char *dk, int dklen);
diff --git a/src/Common/Tests.h b/src/Common/Tests.h
index cd8aaf4c..e98ae884 100644
--- a/src/Common/Tests.h
+++ b/src/Common/Tests.h
@@ -17,7 +17,6 @@ extern unsigned char ks_tmp[MAX_EXPANDED_KEY];
 void CipherInit2(int cipher, void* key, void* ks, int key_len);
 BOOL test_hmac_sha512 (void);
-BOOL test_hmac_sha1 (void);
 BOOL test_hmac_ripemd160 (void);
 BOOL test_hmac_whirlpool (void);
 BOOL test_pkcs5 (void);