Merge pull request DIRACGrid#7569 from DIRACGridBot/cherry-pick-2-24f…

…11c3d9-integration

[sweep:integration] Support M2Crypto 0.40.0+

src/DIRAC/Core/Security/m2crypto/X509CRL.py

@@ -4,7 +4,7 @@
 import re
 import datetime
 
-import M2Crypto
+import M2Crypto.X509
 from DIRAC import S_OK, S_ERROR
 from DIRAC.Core.Utilities import DErrno
 from DIRAC.Core.Utilities.File import secureOpenForWrite

src/DIRAC/Core/Security/m2crypto/X509Certificate.py

@@ -10,7 +10,7 @@
 import random
 import time
 
-import M2Crypto
+import M2Crypto.X509
 
 
 from DIRAC import S_OK, S_ERROR

src/DIRAC/Core/Security/m2crypto/X509Chain.py

@@ -8,7 +8,7 @@
 import hashlib
 import re
 
-import M2Crypto
+import M2Crypto.X509
 
 from DIRAC import S_ERROR, S_OK
 from DIRAC.ConfigurationSystem.Client.Helpers import Registry

src/DIRAC/Core/Security/m2crypto/X509Request.py

@@ -1,7 +1,7 @@
 """ X509Request is a class for managing X509 requests with their Pkeys.
 It's main use is for proxy delegation.
 """
-import M2Crypto
+import M2Crypto.X509
 from DIRAC import S_OK, S_ERROR
 from DIRAC.Core.Security.m2crypto import DEFAULT_PROXY_STRENGTH
 from DIRAC.Core.Utilities import DErrno

src/DIRAC/Core/Tornado/Server/TornadoServer.py

@@ -8,7 +8,7 @@
 import asyncio
 import psutil
 
-import M2Crypto
+import M2Crypto.SSL
 
 import tornado.iostream