From b1d1ae3d1d1a96a67b80d89f16c4d30d24e30257 Mon Sep 17 00:00:00 2001
From: Dmitry Isaenko <developer.su@gmail.com>
Date: Sun, 26 May 2019 04:30:53 +0300
Subject: [PATCH] CSS updates PFS0Encrypted logic intermediate results

---
 .../NCA/NCASectionHeaderBlockController.java  |  9 ++--
 .../NCASectionTableBlock/NCASectionBlock.java |  4 --
 .../FXML/NCA/NCASectionHeaderBlock.fxml       | 47 ++-----------------
 3 files changed, 8 insertions(+), 52 deletions(-)

diff --git a/src/main/java/konogonka/Controllers/NCA/NCASectionHeaderBlockController.java b/src/main/java/konogonka/Controllers/NCA/NCASectionHeaderBlockController.java
index e800024..d932b0a 100644
--- a/src/main/java/konogonka/Controllers/NCA/NCASectionHeaderBlockController.java
+++ b/src/main/java/konogonka/Controllers/NCA/NCASectionHeaderBlockController.java
@@ -92,8 +92,7 @@ public class NCASectionHeaderBlockController {
             BKTRu32Section2Lbl,
             BKTRs32Section2Lbl,
             BKTRunknownSection2Lbl,
-            sectionCTRlowLbl,
-            sectionCTRhighLbl;
+            sectionCTRLbl;
 
     public void resetTab() {
         versionLbl.setText("-");
@@ -167,8 +166,7 @@ public class NCASectionHeaderBlockController {
         BKTRu32Section2Lbl.setText("-");
         BKTRs32Section2Lbl.setText("-");
         BKTRunknownSection2Lbl.setText("-");
-        sectionCTRlowLbl.setText("-");
-        sectionCTRhighLbl.setText("-");
+        sectionCTRLbl.setText("-");
         unknwnEndPaddingTF.setText("-");
     }
 
@@ -258,8 +256,7 @@ public class NCASectionHeaderBlockController {
         BKTRu32Section2Lbl.setText(Integer.toString(ncaSectionBlock.getBKTRu32Section2()));
         BKTRs32Section2Lbl.setText(Integer.toString(ncaSectionBlock.getBKTRs32Section2()));
         BKTRunknownSection2Lbl.setText(byteArrToHexString(ncaSectionBlock.getBKTRunknownSection2()));
-        sectionCTRlowLbl.setText(byteArrToHexString(ncaSectionBlock.getSectionCTRlow()));
-        sectionCTRhighLbl.setText(byteArrToHexString(ncaSectionBlock.getSectionCTRhigh()));
+        sectionCTRLbl.setText(byteArrToHexString(ncaSectionBlock.getSectionCTR()));
         unknwnEndPaddingTF.setText(byteArrToHexString(ncaSectionBlock.getUnknownEndPadding()));
     }
 }
diff --git a/src/main/java/konogonka/Tools/NCA/NCASectionTableBlock/NCASectionBlock.java b/src/main/java/konogonka/Tools/NCA/NCASectionTableBlock/NCASectionBlock.java
index 2e68847..8a4c3f1 100644
--- a/src/main/java/konogonka/Tools/NCA/NCASectionTableBlock/NCASectionBlock.java
+++ b/src/main/java/konogonka/Tools/NCA/NCASectionTableBlock/NCASectionBlock.java
@@ -91,10 +91,6 @@ public class NCASectionBlock {
     public int getBKTRs32Section2() { return BKTRs32Section2; }
     public byte[] getBKTRunknownSection2() { return BKTRunknownSection2; }
     public byte[] getSectionCTR() { return sectionCTR; }
-    // Sugar
-    public byte[] getSectionCTRlow() { return Arrays.copyOfRange(sectionCTR, 0, 0x4); }
-    public byte[] getSectionCTRhigh() { return Arrays.copyOfRange(sectionCTR, 0x4, 0x8); }
-
     public byte[] getUnknownEndPadding() { return unknownEndPadding; }
 }
 
diff --git a/src/main/resources/FXML/NCA/NCASectionHeaderBlock.fxml b/src/main/resources/FXML/NCA/NCASectionHeaderBlock.fxml
index 1b3c882..a02b125 100644
--- a/src/main/resources/FXML/NCA/NCASectionHeaderBlock.fxml
+++ b/src/main/resources/FXML/NCA/NCASectionHeaderBlock.fxml
@@ -29,7 +29,6 @@
         <RowConstraints minHeight="110.0" vgrow="SOMETIMES" />
         <RowConstraints minHeight="110.0" vgrow="SOMETIMES" />
       <RowConstraints maxHeight="30.0" minHeight="30.0" vgrow="SOMETIMES" />
-      <RowConstraints maxHeight="30.0" minHeight="30.0" vgrow="SOMETIMES" />
       <RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES" />
         <RowConstraints />
     </rowConstraints>
@@ -1583,7 +1582,7 @@
       </AnchorPane>
       <AnchorPane styleClass="customGrid" GridPane.columnIndex="1" GridPane.rowIndex="8">
          <children>
-            <Label text="0x4" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <Label text="0x8" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                <padding>
                   <Insets left="5.0" right="5.0" />
                </padding>
@@ -1592,7 +1591,7 @@
       </AnchorPane>
       <AnchorPane styleClass="customGrid" GridPane.rowIndex="9">
          <children>
-            <Label text="0x144" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <Label text="0x148" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                <padding>
                   <Insets left="5.0" right="5.0" />
                </padding>
@@ -1600,24 +1599,6 @@
          </children>
       </AnchorPane>
       <AnchorPane styleClass="customGrid" GridPane.columnIndex="1" GridPane.rowIndex="9">
-         <children>
-            <Label text="0x4" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-               <padding>
-                  <Insets left="5.0" right="5.0" />
-               </padding>
-            </Label>
-         </children>
-      </AnchorPane>
-      <AnchorPane styleClass="customGrid" GridPane.rowIndex="10">
-         <children>
-            <Label text="0x148" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-               <padding>
-                  <Insets left="5.0" right="5.0" />
-               </padding>
-            </Label>
-         </children>
-      </AnchorPane>
-      <AnchorPane styleClass="customGrid" GridPane.columnIndex="1" GridPane.rowIndex="10">
          <children>
             <Label text="0xB8" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                <padding>
@@ -1626,25 +1607,16 @@
             </Label>
          </children>
       </AnchorPane>
-      <AnchorPane styleClass="customGrid" GridPane.columnIndex="2" GridPane.rowIndex="9">
-         <children>
-            <Label text="Section CTR high" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-               <padding>
-                  <Insets left="5.0" right="5.0" />
-               </padding>
-            </Label>
-         </children>
-      </AnchorPane>
       <AnchorPane styleClass="customGrid" GridPane.columnIndex="2" GridPane.rowIndex="8">
          <children>
-            <Label text="Section CTR low" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <Label text="Section CTR (low)" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                <padding>
                   <Insets left="5.0" right="5.0" />
                </padding>
             </Label>
          </children>
       </AnchorPane>
-      <AnchorPane styleClass="customGrid" GridPane.columnIndex="2" GridPane.rowIndex="10">
+      <AnchorPane styleClass="customGrid" GridPane.columnIndex="2" GridPane.rowIndex="9">
          <children>
             <Label text="Unknown (Padding?)" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                <padding>
@@ -1655,7 +1627,7 @@
       </AnchorPane>
       <AnchorPane styleClass="customGrid" GridPane.columnIndex="3" GridPane.rowIndex="8">
          <children>
-            <Label fx:id="sectionCTRlowLbl" layoutX="42.0" layoutY="7.0" text="-" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <Label fx:id="sectionCTRLbl" layoutX="42.0" layoutY="7.0" text="-" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                <padding>
                   <Insets left="5.0" right="5.0" />
                </padding>
@@ -1663,15 +1635,6 @@
          </children>
       </AnchorPane>
       <AnchorPane styleClass="customGrid" GridPane.columnIndex="3" GridPane.rowIndex="9">
-         <children>
-            <Label fx:id="sectionCTRhighLbl" layoutX="28.0" layoutY="6.0" text="-" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-               <padding>
-                  <Insets left="5.0" right="5.0" />
-               </padding>
-            </Label>
-         </children>
-      </AnchorPane>
-      <AnchorPane styleClass="customGrid" GridPane.columnIndex="3" GridPane.rowIndex="10">
          <children>
             <TextField fx:id="unknwnEndPaddingTF" layoutX="-59.0" layoutY="3.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
          </children>