Skip to content

Commit 9a82265

Browse files
authored
TLS-Poodle now defines a default Handshake message Type (#19)
Bug fixes for BooleanModification
1 parent 74541e1 commit 9a82265

File tree

3 files changed

+22
-11
lines changed

3 files changed

+22
-11
lines changed

src/main/java/de/rub/nds/modifiablevariable/VariableModification.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import de.rub.nds.modifiablevariable.biginteger.BigIntegerShiftRightModification;
1616
import de.rub.nds.modifiablevariable.biginteger.BigIntegerSubtractModification;
1717
import de.rub.nds.modifiablevariable.biginteger.BigIntegerXorModification;
18+
import de.rub.nds.modifiablevariable.bool.BooleanExplicitValueModification;
19+
import de.rub.nds.modifiablevariable.bool.BooleanToogleModification;
1820
import de.rub.nds.modifiablevariable.bytearray.ByteArrayDeleteModification;
1921
import de.rub.nds.modifiablevariable.bytearray.ByteArrayDuplicateModification;
2022
import de.rub.nds.modifiablevariable.bytearray.ByteArrayExplicitValueModification;
@@ -49,13 +51,15 @@
4951
@XmlTransient
5052
@XmlSeeAlso({ AccessModificationFilter.class, BigIntegerAddModification.class, BigIntegerInteractiveModification.class,
5153
BigIntegerExplicitValueModification.class, BigIntegerSubtractModification.class,
52-
BigIntegerXorModification.class, BigIntegerShiftLeftModification.class, BigIntegerShiftRightModification.class,
53-
IntegerAddModification.class, IntegerExplicitValueModification.class, IntegerSubtractModification.class,
54-
IntegerXorModification.class, IntegerShiftLeftModification.class, IntegerShiftRightModification.class,
55-
ByteArrayDeleteModification.class, ByteArrayExplicitValueModification.class, ByteArrayInsertModification.class,
56-
ByteArrayXorModification.class, ByteArrayDuplicateModification.class, ByteArrayShuffleModification.class,
57-
ByteAddModification.class, ByteExplicitValueModification.class, ByteSubtractModification.class,
58-
ByteXorModification.class })
54+
BooleanExplicitValueModification.class, BooleanToogleModification.class, BigIntegerXorModification.class,
55+
BigIntegerShiftLeftModification.class, BigIntegerShiftRightModification.class, IntegerAddModification.class,
56+
IntegerExplicitValueModification.class, IntegerSubtractModification.class, IntegerXorModification.class,
57+
IntegerShiftLeftModification.class, IntegerShiftRightModification.class, ByteArrayDeleteModification.class,
58+
ByteArrayExplicitValueModification.class, ByteArrayInsertModification.class, ByteArrayXorModification.class,
59+
ByteArrayDuplicateModification.class, ByteArrayShuffleModification.class, ByteAddModification.class,
60+
ByteExplicitValueModification.class, ByteSubtractModification.class, ByteXorModification.class
61+
62+
})
5963
public abstract class VariableModification<E> {
6064

6165
private static final Logger LOGGER = LogManager.getLogger(VariableModification.class);
@@ -74,7 +78,7 @@ public abstract class VariableModification<E> {
7478

7579
/**
7680
* Get the value of postModification
77-
*
81+
*
7882
* @return the value of postModification
7983
*/
8084
// http://stackoverflow.com/questions/5122296/jaxb-not-unmarshalling-xml-any-element-to-jaxbelement
@@ -85,7 +89,7 @@ public VariableModification<E> getPostModification() {
8589

8690
/**
8791
* Set the value of postModification
88-
*
92+
*
8993
* @param postModification
9094
* new value of postModification
9195
*/
@@ -111,7 +115,7 @@ public E modify(E input) {
111115
/**
112116
* Debugging modified variables. Getting stack trace can be time consuming,
113117
* thus we use isDebugEnabled() function
114-
*
118+
*
115119
* @param value
116120
*/
117121
protected void debug(E value) {

src/main/java/de/rub/nds/modifiablevariable/bool/BooleanExplicitValueModification.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,22 @@
99
package de.rub.nds.modifiablevariable.bool;
1010

1111
import de.rub.nds.modifiablevariable.VariableModification;
12+
import javax.xml.bind.annotation.XmlRootElement;
13+
import javax.xml.bind.annotation.XmlType;
1214

1315
/**
1416
*
1517
* @author Robert Merget <robert.merget@rub.de>
1618
*/
19+
@XmlRootElement
20+
@XmlType(propOrder = { "explicitValue", "modificationFilter", "postModification" })
1721
public class BooleanExplicitValueModification extends VariableModification<Boolean> {
1822

1923
private boolean explicitValue;
2024

25+
public BooleanExplicitValueModification() {
26+
}
27+
2128
public BooleanExplicitValueModification(boolean explicitValue) {
2229
this.explicitValue = explicitValue;
2330
}

src/main/java/de/rub/nds/modifiablevariable/bool/BooleanToogleModification.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @author Robert Merget <robert.merget@rub.de>
1818
*/
1919
@XmlRootElement
20-
@XmlType(propOrder = { "xor", "modificationFilter", "postModification" })
20+
@XmlType(propOrder = { "modificationFilter", "postModification" })
2121
public class BooleanToogleModification extends VariableModification<Boolean> {
2222

2323
public BooleanToogleModification() {

0 commit comments

Comments
 (0)