Security-59754.41.1.tar.gz

[apple/security.git] / OSX / libsecurity_apple_csp / lib / miscAlgFactory.cpp

diff --git a/OSX/libsecurity_apple_csp/lib/miscAlgFactory.cpp b/OSX/libsecurity_apple_csp/lib/miscAlgFactory.cpp
index 89b81d2c5a0efa0f28354e05cc41b7f898822aa7..ae07d293364de8a3e7d18de01c2c4be856a7f59a 100644 (file)
--- a/OSX/libsecurity_apple_csp/lib/miscAlgFactory.cpp
+++ b/OSX/libsecurity_apple_csp/lib/miscAlgFactory.cpp
@@ -37,22 +37,6 @@
 #include "castContext.h"
 #include <Security/cssmapple.h>
 
 #include "castContext.h"
 #include <Security/cssmapple.h>
 

-/*
- * These #defines are mainly to facilitate measuring the performance of our own
- * implementation vs. the ones in BSafe. This factory gets called first; if
- * we disable e.g. DES here the BSAFE version will be used.
- */
-#ifdef BSAFE_CSP_ENABLE
-
-#define MAF_DES_ENABLE         0
-#define MAF_DES3_ENABLE                0
-#define MAF_RC2_ENABLE         0
-#define MAF_RC4_ENABLE         0
-#define MAF_RC5_ENABLE         0
-#define MAF_MAC_ENABLE         0
-
-#else  /* !BSAFE_CSP_ENABLE, normal case */
-

 #define MAF_DES_ENABLE         1
 #define MAF_DES3_ENABLE                1
 #define MAF_RC2_ENABLE         1
 #define MAF_DES_ENABLE         1
 #define MAF_DES3_ENABLE                1
 #define MAF_RC2_ENABLE         1


@@ -60,8 +44,6 @@
 #define MAF_RC5_ENABLE         1
 #define MAF_MAC_ENABLE         1
 
 #define MAF_RC5_ENABLE         1
 #define MAF_MAC_ENABLE         1
 

-#endif /* BSAFE_CSP_ENABLE */
-

 #if    (!MAF_DES_ENABLE || !MAF_DES3_ENABLE || !MAF_RC2_ENABLE || !MAF_RC4_ENABLE || \
                !MAF_RC5_ENABLE || !MAF_MAC_ENABLE)
 #warning       Internal DES/RC2/RC4/RC5/Mac implementation disabled!
 #if    (!MAF_DES_ENABLE || !MAF_DES3_ENABLE || !MAF_RC2_ENABLE || !MAF_RC4_ENABLE || \
                !MAF_RC5_ENABLE || !MAF_MAC_ENABLE)
 #warning       Internal DES/RC2/RC4/RC5/Mac implementation disabled!