Skip to content

Commit 3abaa00

Browse files
authored
Merge pull request #7329 from DIRACGridBot/cherry-pick-2-db000dc9b-integration
[sweep:integration] fixes SSL 2048
2 parents a23e350 + 32090bc commit 3abaa00

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/DIRAC/Core/DISET/private/Transports/test/Test_SSLTransport.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import selectors
44
import threading
55

6+
from diraccfg import CFG
67
from pytest import fixture
78

8-
from diraccfg import CFG
9-
from DIRAC.Core.Security.test.x509TestUtilities import CERTDIR, USERCERT, getCertOption
109
from DIRAC.ConfigurationSystem.Client.ConfigurationData import gConfigurationData
11-
from DIRAC.Core.DISET.private.Transports import PlainTransport, M2SSLTransport
10+
from DIRAC.Core.DISET.private.Transports import M2SSLTransport, PlainTransport
11+
from DIRAC.Core.Security.test.x509TestUtilities import CERTDIR, USERCERT, getCertOption
1212

1313
# TODO: Expired hostcert
1414
# TODO: Expired usercert

tests/openssl_config_DIRACDockerDevBox

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[ req ]
2-
default_bits = 1024
2+
default_bits = 2048
33
encrypt_key = yes
44
distinguished_name = req_dn
55
prompt = no

tests/openssl_config_DIRACDockerDevBox_usr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[ req ]
2-
default_bits = 1024
2+
default_bits = 2048
33
encrypt_key = yes
44
distinguished_name = req_dn
55
prompt = no

0 commit comments

Comments
 (0)