Merge pull request #51655 from garethgreenaway/49661_starting_salt_master_openssl

[2017.7] Removing unused salt.crypt imports

salt/config/__init__.py

@@ -3572,7 +3572,6 @@ def apply_master_config(overrides=None, defaults=None):
     '''
     Returns master configurations dict.
     '''
-    import salt.crypt
     if defaults is None:
         defaults = DEFAULT_MASTER_OPTS
 

salt/payload.py

@@ -14,7 +14,6 @@ import datetime
 
 # Import salt libs
 import salt.log
-import salt.crypt
 import salt.transport.frame
 from salt.exceptions import SaltReqTimeoutError
 from salt.utils import immutabletypes

salt/utils/rsax931.py

@@ -70,9 +70,7 @@ def _init_libcrypto():
     libcrypto.RSA_public_decrypt.argtypes = (c_int, c_char_p, c_char_p, c_void_p, c_int)
 
     try:
-        libcrypto.OPENSSL_init_crypto(OPENSSL_INIT_NO_LOAD_CONFIG |
-                                      OPENSSL_INIT_ADD_ALL_CIPHERS |
-                                      OPENSSL_INIT_ADD_ALL_DIGESTS, None)
+        libcrypto.OPENSSL_init_crypto()
     except AttributeError:
         # Support for OpenSSL < 1.1 (OPENSSL_API_COMPAT < 0x10100000L)
         libcrypto.OPENSSL_no_config()