BCCSP config back to SHA2

Make defaults consistent to those in bccsp/factory/opts.go Change-Id: Ic0fc8444d0160263b180480d9e5551ff8052cbe0 Signed-off-by: Volodymyr Paprotski <vpaprots@ca.ibm.com>
hyperledger · Feb 27, 2017 · 48d19be · 48d19be
1 parent 9a09ac0
commit 48d19be
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/common/configtx/tool/configtx.yaml b/common/configtx/tool/configtx.yaml
@@ -67,7 +67,10 @@ Organizations:
         BCCSP:
             Default: SW
             SW:
-                Hash: SHA3
+                # TODO: The default Hash and Security level needs refactoring to be
+                # fully configurable. Changing these defaults requires coordination
+                # SHA2 is hardcoded in several places, not only BCCSP
+                Hash: SHA2
                 Security: 256
                 # Location of key store. If this is unset, a location will
                 # be chosen using: 'MSPDir'/keystore

diff --git a/core/endorser/endorser_test.yaml b/core/endorser/endorser_test.yaml
@@ -17,15 +17,6 @@ server:
         # TLS certificate and key file paths
         tls:
 
-security:
-    # Can be 256 or 384
-    # Must be the same as in core.yaml
-    level: 256
-
-    # Can be SHA2 or SHA3
-    # Must be the same as in core.yaml
-    hashAlgorithm: SHA3
-
 # Enabling/disabling different logging levels of the CA.
 #
 logging:
@@ -329,7 +320,10 @@ peer:
     BCCSP:
         Default: SW
         SW:
-            Hash: SHA3
+            # TODO: The default Hash and Security level needs refactoring to be
+            # fully configurable. Changing these defaults requires coordination
+            # SHA2 is hardcoded in several places, not only BCCSP
+            Hash: SHA2
             Security: 256
             FileKeyStore: 
                 KeyStore:

diff --git a/orderer/orderer.yaml b/orderer/orderer.yaml
@@ -69,7 +69,10 @@ General:
     BCCSP:
         Default: SW
         SW:
-            Hash: SHA3
+            # TODO: The default Hash and Security level needs refactoring to be
+            # fully configurable. Changing these defaults requires coordination
+            # SHA2 is hardcoded in several places, not only BCCSP
+            Hash: SHA2
             Security: 256
             # Location of key store. If this is unset, a location will be
             # chosen using: 'LocalMSPDir'/keystore

diff --git a/peer/core.yaml b/peer/core.yaml
@@ -205,7 +205,10 @@ peer:
     BCCSP:
         Default: SW
         SW:
-            Hash: SHA3
+            # TODO: The default Hash and Security level needs refactoring to be
+            # fully configurable. Changing these defaults requires coordination
+            # SHA2 is hardcoded in several places, not only BCCSP
+            Hash: SHA2
             Security: 256
             # Location of Key Store, can be subdirectory of SbftLocal.DataDir
             FileKeyStore: