Added last-received Voucher function to Pledge, and printout of this …

…voucher in the IETF draft-constrained-brski test.
EskoDijk · Dec 7, 2022 · 0d12bcb · 0d12bcb
1 parent 5665367
commit 0d12bcb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/com/google/openthread/pledge/Pledge.java b/src/main/java/com/google/openthread/pledge/Pledge.java
@@ -272,6 +272,7 @@ public Voucher requestVoucher(VoucherRequest req)
     if (payload == null) {
       throw new PledgeException("unexpected null payload");
     }
+    this.lastVoucherCoseSigned = payload;
 
     // 2. Receive voucher signed by MASA CA
     try {
@@ -589,6 +590,10 @@ public byte[] getLastPvrCoseSigned() {
     return this.lastPvrCoseSigned;
   }
 
+  public byte[] getLastVoucherCoseSigned() {
+    return this.lastVoucherCoseSigned;
+  }
+
   private void init(Credentials creds, String hostURI, boolean isLightweightClientCerts)
       throws PledgeException {
 
@@ -785,6 +790,7 @@ private String getBRSKIPath() {
 
   private VoucherRequest lastPvr = null;
   private byte[] lastPvrCoseSigned = null;
+  private byte[] lastVoucherCoseSigned = null;
 
   private static Logger logger = LoggerFactory.getLogger(Pledge.class);
 }
diff --git a/src/test/java/com/google/openthread/registrar/IETFConstrainedBrskiTest.java b/src/test/java/com/google/openthread/registrar/IETFConstrainedBrskiTest.java
@@ -143,6 +143,8 @@ public void testVoucherRequestAndDisplayArtifacts() throws Exception {
     logger.info("Registrar Voucher Request (RVR) sent by Registrar:\n" + registrar.getLastRvr().toString());
     logger.info("Registrar Voucher Request (RVR) sent by Registrar as Hex string:\n" + Hex.toHexString(registrar.getLastRvrCoseSigned()));
 
+    logger.info("Voucher created by MASA:\n" + voucher);
+    logger.info("Voucher created by MASA as Hex string:\n" + Hex.toHexString(pledge.getLastVoucherCoseSigned()));
 
   }