Merge pull request #79 from jakcron/v1.6-stable

Update NSTool to v1.6.3
This commit is contained in:
Jack 2022-04-02 17:13:45 +08:00 committed by GitHub
commit ebd86508ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 5 deletions

@ -1 +1 @@
Subproject commit 19d38735ba4eb393faefefc3c923144628456857 Subproject commit 74168c5ecdd80eb9ce675e2b9c085ea8a09babb2

@ -1 +1 @@
Subproject commit 0635b0c532f4ef152506775c930b3d45f575a14c Subproject commit 2d8917913216530c487363f17a4a3c808b54129d

View file

@ -39,7 +39,6 @@ void nstool::PkiValidator::addCertificates(const std::vector<nn::pki::SignedData
void nstool::PkiValidator::addCertificate(const nn::pki::SignedData<nn::pki::CertificateBody>& cert) void nstool::PkiValidator::addCertificate(const nn::pki::SignedData<nn::pki::CertificateBody>& cert)
{ {
std::string cert_ident; std::string cert_ident;
nn::pki::sign::SignatureAlgo cert_sign_algo;
nn::pki::sign::HashAlgo cert_hash_algo; nn::pki::sign::HashAlgo cert_hash_algo;
tc::ByteData cert_hash; tc::ByteData cert_hash;
@ -52,7 +51,6 @@ void nstool::PkiValidator::addCertificate(const nn::pki::SignedData<nn::pki::Cer
throw tc::Exception(mModuleName, "Certificate already exists"); throw tc::Exception(mModuleName, "Certificate already exists");
} }
cert_sign_algo = nn::pki::sign::getSignatureAlgo(cert.getSignature().getSignType());
cert_hash_algo = nn::pki::sign::getHashAlgo(cert.getSignature().getSignType()); cert_hash_algo = nn::pki::sign::getHashAlgo(cert.getSignature().getSignType());
// get cert hash // get cert hash

View file

@ -3,5 +3,5 @@
#define BIN_NAME "nstool" #define BIN_NAME "nstool"
#define VER_MAJOR 1 #define VER_MAJOR 1
#define VER_MINOR 6 #define VER_MINOR 6
#define VER_PATCH 2 #define VER_PATCH 3
#define AUTHORS "jakcron" #define AUTHORS "jakcron"