Merge branch 'main' into pr-cbrski

EskoDijk · Sep 1, 2024 · d0397b0 · d0397b0
2 parents 0be65c5 + f4c78aa
commit d0397b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/com/google/openthread/SecurityUtils.java b/src/main/java/com/google/openthread/SecurityUtils.java
@@ -96,6 +96,7 @@
 import org.bouncycastle.cms.CMSSignedData;
 import org.bouncycastle.cms.CMSSignedDataGenerator;
 import org.bouncycastle.cms.CMSTypedData;
+import org.bouncycastle.cms.SignerId;
 import org.bouncycastle.cms.SignerInfoGenerator;
 import org.bouncycastle.cms.SignerInformation;
 import org.bouncycastle.cms.SignerInformationStore;

diff --git a/src/main/java/com/google/openthread/main/OtRegistrarConfig.java b/src/main/java/com/google/openthread/main/OtRegistrarConfig.java
@@ -118,4 +118,5 @@ public String ToStringSingleLine() {
     }
     s += " verbosity=" + this.logVerbosity;
     return s;
-  }}
+  }
+}