mirror of
https://github.com/nsacyber/HIRS.git
synced 2025-04-08 11:54:27 +00:00
Small commit, setting up for another right after with a lot of changes
This commit is contained in:
parent
c23e4a4a07
commit
1f77f3fe26
@ -2,7 +2,6 @@ plugins {
|
||||
id 'application'
|
||||
id 'java'
|
||||
id 'war'
|
||||
id "nebula.ospackage" version "9.1.1"
|
||||
id 'org.springframework.boot' version '3.0.1'
|
||||
id 'io.spring.dependency-management' version '1.1.0'
|
||||
}
|
||||
@ -91,4 +90,4 @@ compileJava.dependsOn generateXjcLibrary
|
||||
// buildRpm {
|
||||
// arch = X86_64
|
||||
// }
|
||||
//}
|
||||
//}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -81,66 +81,4 @@ public class SwidResource {
|
||||
this.digest = digest;
|
||||
// tpmWhiteList = new TpmWhiteListBaseline(this.name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the file name.
|
||||
*
|
||||
* @return string of the file name
|
||||
*/
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the file size.
|
||||
*
|
||||
* @return string of the file size.
|
||||
*/
|
||||
public String getSize() {
|
||||
return size;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the RIM format for the resource.
|
||||
*
|
||||
* @return string of the format
|
||||
*/
|
||||
public String getRimFormat() {
|
||||
return rimFormat;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the RIM resource type.
|
||||
*
|
||||
* @return string of the resource type.
|
||||
*/
|
||||
public String getRimType() {
|
||||
return rimType;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the RIM Global URI.
|
||||
*
|
||||
* @return string of the URI
|
||||
*/
|
||||
public String getRimUriGlobal() {
|
||||
return rimUriGlobal;
|
||||
}
|
||||
|
||||
/**
|
||||
* Getter for the associated Hash of the file.
|
||||
*
|
||||
* @return string of the hash
|
||||
*/
|
||||
public String getHashValue() {
|
||||
return hashValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* flag for if the file sizes match with the swidtag.
|
||||
* @return true if they match
|
||||
*/
|
||||
public boolean isValidFileSize() {
|
||||
return validFileSize;
|
||||
}
|
||||
}
|
@ -81,8 +81,8 @@ public class UefiX509Cert {
|
||||
String certData = "";
|
||||
certData += " Certificate Serial Number = "
|
||||
+ x509Cert.getSerialNumber().toString(UefiConstants.SIZE_16) + "\n";
|
||||
certData += " Subject DN = " + x509Cert.getSubjectDN() + "\n";
|
||||
certData += " Issuer DN = " + x509Cert.getIssuerDN() + "\n";
|
||||
certData += " Subject DN = " + x509Cert.getSubjectX500Principal().getName() + "\n";
|
||||
certData += " Issuer DN = " + x509Cert.getIssuerX500Principal().getName() + "\n";
|
||||
certData += " Not Before Date = " + x509Cert.getNotBefore() + "\n";
|
||||
certData += " Not After Date = " + x509Cert.getNotAfter() + "\n";
|
||||
certData += " Signature Algorithm = " + x509Cert.getSigAlgName() + "\n";
|
||||
|
@ -8,15 +8,16 @@
|
||||
|
||||
package hirs.attestationca.portal.utils.xjc;
|
||||
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlAnyAttribute;
|
||||
import jakarta.xml.bind.annotation.XmlAttribute;
|
||||
import jakarta.xml.bind.annotation.XmlSeeAlso;
|
||||
import jakarta.xml.bind.annotation.XmlType;
|
||||
|
||||
import javax.xml.namespace.QName;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlAnyAttribute;
|
||||
import javax.xml.bind.annotation.XmlAttribute;
|
||||
import javax.xml.bind.annotation.XmlSeeAlso;
|
||||
import javax.xml.bind.annotation.XmlType;
|
||||
import javax.xml.namespace.QName;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -10,13 +10,13 @@ package hirs.attestationca.portal.utils.xjc;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import javax.xml.bind.annotation.XmlAccessType;
|
||||
import javax.xml.bind.annotation.XmlAccessorType;
|
||||
import javax.xml.bind.annotation.XmlAnyElement;
|
||||
import javax.xml.bind.annotation.XmlAttribute;
|
||||
import javax.xml.bind.annotation.XmlMixed;
|
||||
import javax.xml.bind.annotation.XmlSchemaType;
|
||||
import javax.xml.bind.annotation.XmlType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessType;
|
||||
import jakarta.xml.bind.annotation.XmlAccessorType;
|
||||
import jakarta.xml.bind.annotation.XmlAnyElement;
|
||||
import jakarta.xml.bind.annotation.XmlAttribute;
|
||||
import jakarta.xml.bind.annotation.XmlMixed;
|
||||
import jakarta.xml.bind.annotation.XmlSchemaType;
|
||||
import jakarta.xml.bind.annotation.XmlType;
|
||||
|
||||
|
||||
/**
|
||||
|
@ -2,13 +2,20 @@
|
||||
<xs:schema
|
||||
xmlns="http://standards.iso.org/iso/19770/-2/2015/schema.xsd"
|
||||
xmlns:swid="http://standards.iso.org/iso/19770/-2/2015/schema.xsd"
|
||||
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
|
||||
xmlns:xs="http://www.w3.org/2001/XMLSchema"
|
||||
xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
|
||||
xmlns:xml="http://www.w3.org/XML/1998/namespace"
|
||||
|
||||
targetNamespace="http://standards.iso.org/iso/19770/-2/2015/schema.xsd"
|
||||
elementFormDefault="qualified">
|
||||
|
||||
<xs:annotation>
|
||||
<xs:documentation>
|
||||
This is the XML Schema for the Jakarta XML Binding binding customization descriptor. All binding customization descriptors must indicate the descriptor schema by using the Jakarta XML Binding namespace: https://jakarta.ee/xml/ns/jaxb and by indicating the version of the schema by using the version element as shown below:
|
||||
<bindings xmlns="https://jakarta.ee/xml/ns/jaxb" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd" version="3.0"> ... </bindings>
|
||||
The instance documents may indicate the published version of the schema using the xsi:schemaLocation attribute for Jakarta XML Binding namespace with the following location: https://jakarta.ee/xml/ns/jaxb/bindingschema_3_0.xsd
|
||||
</xs:documentation>
|
||||
</xs:annotation>
|
||||
<xs:import
|
||||
namespace="http://www.w3.org/2000/09/xmldsig#"
|
||||
schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
|
||||
|
Loading…
x
Reference in New Issue
Block a user