@@ -97,8 +97,8 @@ public ProbeResult executeTest() {
97
97
boolean vulnerable = false ;
98
98
99
99
for (ProtocolVersion version : versionList ) {
100
- if (vulnerable ) {
101
- break ;
100
+ if (vulnerable && scannerConfig . getScanDetail (). isGreaterEqualTo ( ScannerDetail . QUICK ) ) {
101
+
102
102
}
103
103
VersionSuiteListPair suitePairList = null ;
104
104
for (VersionSuiteListPair versionSuiteList : serverSupportedSuites ) {
@@ -111,9 +111,6 @@ public ProbeResult executeTest() {
111
111
continue ;
112
112
}
113
113
for (PaddingVectorGeneratorType vectorType : vectorTypeList ) {
114
- if (vulnerable ) {
115
- break ;
116
- }
117
114
Set <CipherSuite > set = new HashSet <>(suitePairList .getCiphersuiteList ());
118
115
filterSuite (set );
119
116
for (CipherSuite suite : set ) {
@@ -125,7 +122,6 @@ public ProbeResult executeTest() {
125
122
PaddingOracleTestResult result = createTestResult (version , suite , paddingOracleConfig );
126
123
if (result .getVulnerable () == Boolean .TRUE ) {
127
124
vulnerable = true ;
128
- break ;
129
125
}
130
126
testResultList .add (result );
131
127
}
@@ -170,12 +166,13 @@ public ProbeResult executeTest() {
170
166
private PaddingOracleTestResult createTestResult (ProtocolVersion version , CipherSuite suite , PaddingOracleCommandConfig paddingOracleConfig ) {
171
167
172
168
Boolean result ;
173
- try {
174
- Thread .currentThread ().sleep (10000 );
175
- } catch (InterruptedException ex ) {
176
- Logger .getLogger (PaddingOracleProbe .class .getName ()).log (Level .SEVERE , null , ex );
177
- }
178
169
PaddingOracleAttacker attacker = new PaddingOracleAttacker (paddingOracleConfig , scannerConfig .createConfig (), getParallelExecutor ());
170
+ if (scannerConfig .getScanDetail ().isGreaterEqualTo (ScannerDetail .DETAILED )) {
171
+ attacker .setAdditionalTimeout (1000 );
172
+ attacker .setIncreasingTimeout (true );
173
+ } else {
174
+ attacker .setAdditionalTimeout (50 );
175
+ }
179
176
boolean hasError = false ;
180
177
try {
181
178
result = attacker .isVulnerable ();
0 commit comments