Skip to content

Commit ff1729c

Browse files
authored
Merge pull request #378 from RUB-NDS/v21release
V21release
2 parents 8fc208b + afb6976 commit ff1729c

File tree

118 files changed

+149
-520
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+149
-520
lines changed

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/PskBruteForcerAttackClientCommandConfig.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
import org.apache.logging.log4j.Level;
2525
import org.apache.logging.log4j.core.config.Configurator;
2626

27-
/**
28-
*
29-
* @author florian
30-
*/
3127
public class PskBruteForcerAttackClientCommandConfig extends AttackConfig {
3228
public static final String ATTACK_COMMAND = "pskbruteforcerclient";
3329

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/PskBruteForcerAttackServerCommandConfig.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@
2424
import org.apache.logging.log4j.Level;
2525
import org.apache.logging.log4j.core.config.Configurator;
2626

27-
/**
28-
*
29-
* @author florian
30-
*/
3127
public class PskBruteForcerAttackServerCommandConfig extends AttackConfig {
3228
public static final String ATTACK_COMMAND = "pskbruteforcerserver";
3329

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/config/TooManyAlgorithmsAttackConfig.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
import de.rub.nds.tlsattacker.core.config.delegate.HostnameExtensionDelegate;
1616
import de.rub.nds.tlsattacker.core.config.delegate.ProtocolVersionDelegate;
1717

18-
/**
19-
*
20-
* @author Robert Merget <robert.merget@rub.de>
21-
*/
2218
public class TooManyAlgorithmsAttackConfig extends AttackConfig {
2319

2420
public static final String ATTACK_COMMAND = "too_many_algorithms";

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/ec/ICEAttacker.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,13 @@ private void attackOracle() {
177177
* compute the server private key with CRT.
178178
*
179179
* @param usedOracleEquations
180+
* The used oracle equations
180181
* @param congs
182+
* The congruences
181183
* @param modulis
184+
* The modulis
182185
* @param pointer
186+
* the pointer
183187
*/
184188
public void bruteForceWithAdditionalOracleEquations(int[] usedOracleEquations, BigInteger[] congs,
185189
BigInteger[] modulis, int pointer) {
@@ -209,9 +213,12 @@ public void bruteForceWithAdditionalOracleEquations(int[] usedOracleEquations, B
209213
* Computes CRT from a given combination of congs and modulis
210214
*
211215
* @param usedOracleEquations
216+
* The used oracle equations
212217
* @param congs
218+
* The congruences
213219
* @param modulis
214-
* @return
220+
* The modulis
221+
* @return CRTF
215222
*/
216223
private BigInteger computeCRTFromCombination(int[] usedOracleEquations, BigInteger[] congs, BigInteger[] modulis) {
217224
BigInteger[] usedCongs = new BigInteger[usedOracleEquations.length];
@@ -235,7 +242,8 @@ private int[] initializeUsedOracleEquations(int size) {
235242
* Uses the oracle to get a congruence for a specific point
236243
*
237244
* @param point
238-
* @return
245+
* A Point
246+
* @return The Congruence
239247
*/
240248
private BigInteger getCongruence(ICEPoint point) {
241249
BigInteger secretModOrder = BigInteger.ZERO;

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/ec/ICEPointReader.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public class ICEPointReader {
2828
* this named curve
2929
*
3030
* @param namedCurve
31-
* @return
31+
* The NamedCurve as a String
32+
* @return the deserialized Points
3233
*/
3334
public static List<ICEPoint> readPoints(String namedCurve) {
3435
String namedCurveLow = namedCurve.toLowerCase();

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/ec/oracles/ECOracle.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ public abstract class ECOracle {
3434
* secret was guessed correctly.
3535
*
3636
* @param ecPoint
37+
* The Point
3738
* @param guessedSecret
38-
* @return
39+
* The guessed Secret
40+
* @return True if the secret is guessed correctly
3941
*/
4042
public abstract boolean checkSecretCorrectnes(Point ecPoint, BigInteger guessedSecret);
4143

@@ -45,7 +47,8 @@ public abstract class ECOracle {
4547
* correct.
4648
*
4749
* @param guessedSecret
48-
* @return
50+
* The guessed Secret
51+
* @return True if the Solution is correct
4952
*/
5053
public abstract boolean isFinalSolutionCorrect(BigInteger guessedSecret);
5154

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/Attacker.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
/**
2525
* @param <Config>
26+
* The AttackConfig
2627
*/
2728
public abstract class Attacker<Config extends AttackConfig> {
2829

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/PskBruteForcerAttackClient.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@
4646
import de.rub.nds.tlsattacker.core.workflow.factory.WorkflowTraceType;
4747
import java.security.NoSuchAlgorithmException;
4848

49-
/**
50-
*
51-
* @author florian
52-
*/
5349
public class PskBruteForcerAttackClient extends Attacker<PskBruteForcerAttackClientCommandConfig> {
5450
private static final Logger LOGGER = LogManager.getLogger(PskBruteForcerAttackClient.class);
5551
private ServerTcpTransportHandler transportHandler;

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/PskBruteForcerAttackServer.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@
4545
import java.io.IOException;
4646
import java.io.InputStreamReader;
4747

48-
/**
49-
*
50-
* @author florian
51-
*/
5248
public class PskBruteForcerAttackServer extends Attacker<PskBruteForcerAttackServerCommandConfig> {
5349
private static final Logger LOGGER = LogManager.getLogger(PskBruteForcerAttackServer.class);
5450

Attacks/src/main/java/de/rub/nds/tlsattacker/attacks/impl/TooManyAlgorithmsAttacker.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
import java.util.List;
2424
import java.util.Random;
2525

26-
/**
27-
*
28-
* @author Robert Merget <robert.merget@rub.de>
29-
*/
3026
public class TooManyAlgorithmsAttacker extends Attacker<TooManyAlgorithmsAttackConfig> {
3127

3228
public TooManyAlgorithmsAttacker(TooManyAlgorithmsAttackConfig config) {

0 commit comments

Comments
 (0)