libsecurity_codesigning-55037.15.tar.gz

[apple/libsecurity_codesigning.git] / lib / reqdumper.cpp

diff --git a/lib/reqdumper.cpp b/lib/reqdumper.cpp
index 491b9625b270e34d8f2d904c0b53fcee4a1b2339..ceca15012fc2f3d6c01c06958aeae5b8d99f45a4 100644 (file)
--- a/lib/reqdumper.cpp
+++ b/lib/reqdumper.cpp
@@ -109,7 +109,7 @@ string Dumper::dump(const Requirement *req, bool debug /* = false */)
        } catch (const CommonError &err) {
                if (debug) {
                        char errstr[80];
-                       snprintf(errstr, sizeof(errstr), " !! error %ld !!", err.osStatus());
+                       snprintf(errstr, sizeof(errstr), " !! error %ld !!", (unsigned long)err.osStatus());
                        return dumper.value() + errstr;
                }
                throw;
@@ -208,12 +208,27 @@ void Dumper::expr(SyntaxLevel level)
                }
                print("]"); match();
                break;
+       case opCertPolicy:
+               print("certificate"); certSlot(); print("[");
+               {
+                       const unsigned char *data; size_t length;
+                       getData(data, length);
+                       print("policy.%s", CssmOid((unsigned char *)data, length).toOid().c_str());
+               }
+               print("]"); match();
+               break;
        case opTrustedCert:
                print("certificate"); certSlot(); print("trusted");
                break;
        case opTrustedCerts:
                print("anchor trusted");
                break;
+       case opNamedAnchor:
+               print("anchor apple "); data();
+               break;
+       case opNamedCode:
+               print("("); data(); print(")");
+               break;
        default:
                if (op & opGenericFalse) {
                        print(" false /* opcode %d */", op & ~opFlagMask);