Fix CDHash in -h

[ldid.git] / ldid.cpp

diff --git a/ldid.cpp b/ldid.cpp
index 5e4ded29b5c1f655ccf2c38181419ea56b49956b..1703da026ef65d06dc2f1e8c4e77228a1540f979 100644 (file)
--- a/ldid.cpp
+++ b/ldid.cpp
@@ -3577,7 +3577,7 @@ int main(int argc, char *argv[]) {
                         auto &algorithm(*algorithms[type - 1]);
                         uint8_t hash[algorithm.size_];
                         algorithm(hash, blob + begin, end - begin);
-                        candidates.insert({type, {directory, end - begin, algorithm, Hex(hash, 20), begin}});
+                        candidates.insert({type, {directory, end - begin, algorithm, Hex(hash, algorithm.size_), begin}});
                     } else if (type == CSSLOT_SIGNATURESLOT) {
                         cmsBegin = Swap(super->index[index].offset);
                         cmsEnd = index + 1 == Swap(super->count) ? Swap(super->blob.length) : Swap(super->index[index + 1].offset);
@@ -3622,11 +3622,12 @@ int main(int argc, char *argv[]) {
                     auto choice(candidate.second.algorithm_.name());
                     choices += ',';
                     choices += choice;
-                    printf("CandidateCDHash %s=%s\n", choice, candidate.second.hash_.c_str());
+                    printf("CandidateCDHash %s=%.40s\n", choice, candidate.second.hash_.c_str());
+                    printf("CandidateCDHashFull %s=%s\n", choice, candidate.second.hash_.c_str());
                 }
                 printf("Hash choices=%s\n", choices.c_str() + 1);
 
-                printf("CDHash=%s\n", best->second.hash_.c_str());
+                printf("CDHash=%.40s\n", best->second.hash_.c_str());
 
                 if (cmsBegin != 0 && cmsEnd != 0) {
                     // This loads the CMS blob and parses each X509 cert in the blob to extract the
@@ -3636,44 +3637,48 @@ int main(int argc, char *argv[]) {
                     if ((p7 = d2i_PKCS7_bio(bio, NULL)) == NULL) {
                         // In order to follow codesign, we just ignore errors
                         printf("Authority=(unavailable)\n");
-                        PKCS7_free(p7);
-                        continue;
-                    }
-                    STACK_OF(X509) *certs = NULL;
-                    switch (OBJ_obj2nid(p7->type)) {
-                        case NID_pkcs7_signed:
-                            if (p7->d.sign != NULL)
-                                certs = p7->d.sign->cert;
-                            break;
-                        case NID_pkcs7_signedAndEnveloped:
-                            if (p7->d.signed_and_enveloped != NULL)
-                                certs = p7->d.signed_and_enveloped->cert;
-                            break;
-                        default:
-                            break;
-                    }
-                    if (certs != NULL) {
-                        X509 *x;
-                        for (int i = 0; i < sk_X509_num(certs); i++) {
-                            x = sk_X509_value(certs, i);
-                            int lastpos = -1;
-                            X509_NAME *nm = X509_get_subject_name(x);
-                            X509_NAME_ENTRY *e;
-
-                            for (;;) {
-                                lastpos = X509_NAME_get_index_by_NID(nm, NID_commonName, lastpos);
-                                if (lastpos == -1)
-                                    break;
-                                e = X509_NAME_get_entry(nm, lastpos);
-                                ASN1_STRING *s = X509_NAME_ENTRY_get_data(e);
-                                printf("Authority=%s\n", reinterpret_cast<const char *>(ASN1_STRING_get0_data(s)));
+                    } else {
+                        STACK_OF(X509) *certs = NULL;
+                        switch (OBJ_obj2nid(p7->type)) {
+                            case NID_pkcs7_signed:
+                                if (p7->d.sign != NULL)
+                                    certs = p7->d.sign->cert;
+                                break;
+                            case NID_pkcs7_signedAndEnveloped:
+                                if (p7->d.signed_and_enveloped != NULL)
+                                    certs = p7->d.signed_and_enveloped->cert;
+                                break;
+                            default:
+                                break;
+                        }
+                        if (certs != NULL) {
+                            X509 *x;
+                            for (int i = 0; i < sk_X509_num(certs); i++) {
+                                x = sk_X509_value(certs, i);
+                                int lastpos = -1;
+                                X509_NAME *nm = X509_get_subject_name(x);
+                                X509_NAME_ENTRY *e;
+
+                                for (;;) {
+                                    lastpos = X509_NAME_get_index_by_NID(nm, NID_commonName, lastpos);
+                                    if (lastpos == -1)
+                                        break;
+                                    e = X509_NAME_get_entry(nm, lastpos);
+                                    ASN1_STRING *s = X509_NAME_ENTRY_get_data(e);
+                                    printf("Authority=%s\n", reinterpret_cast<const char *>(ASN1_STRING_get0_data(s)));
+                                }
                             }
+                        } else {
+                            printf("Authority=(unavailable)\n");
                         }
-                    } else {
-                        printf("Authority=(unavailable)\n");
                     }
                     PKCS7_free(p7);
                 }
+
+                if (Swap(directory->teamIDOffset) > 0)
+                    printf("TeamIdentifier=%s\n", blob + best->second.offset + Swap(directory->teamIDOffset));
+                else
+                    printf("TeamIdentifier=not set\n");
             }
         }