Security-58286.20.16.tar.gz

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

diff --git a/OSX/libsecurity_codesigning/lib/reqdumper.cpp b/OSX/libsecurity_codesigning/lib/reqdumper.cpp
index c7e180f6652376511d22446dcbc33629b3e07be5..c971f0ffd7db19f76872d11fee376a9c0e5f96a8 100644 (file)
--- a/OSX/libsecurity_codesigning/lib/reqdumper.cpp
+++ b/OSX/libsecurity_codesigning/lib/reqdumper.cpp
@@ -25,7 +25,9 @@
 // reqdumper - Requirement un-parsing (disassembly)
 //
 #include "reqdumper.h"
 // reqdumper - Requirement un-parsing (disassembly)
 //
 #include "reqdumper.h"

+#if TARGET_OS_OSX

 #include <security_cdsa_utilities/cssmdata.h>  // OID encoder
 #include <security_cdsa_utilities/cssmdata.h>  // OID encoder

+#endif

 #include <cstdarg>
 
 namespace Security {
 #include <cstdarg>
 
 namespace Security {


@@ -121,10 +123,8 @@ string Dumper::dump(const BlobCore *req, bool debug /* = false */)
        switch (req->magic()) {
        case Requirement::typeMagic:
                return dump(static_cast<const Requirement *>(req), debug);
        switch (req->magic()) {
        case Requirement::typeMagic:
                return dump(static_cast<const Requirement *>(req), debug);

-               break;

        case Requirements::typeMagic:
                return dump(static_cast<const Requirements *>(req), debug);
        case Requirements::typeMagic:
                return dump(static_cast<const Requirements *>(req), debug);

-               break;

        default:
                return "invalid data type";
        }
        default:
                return "invalid data type";
        }


@@ -201,20 +201,24 @@ void Dumper::expr(SyntaxLevel level)
                break;
        case opCertGeneric:
                print("certificate"); certSlot(); print("[");
                break;
        case opCertGeneric:
                print("certificate"); certSlot(); print("[");

+#if TARGET_OS_OSX

                {
                        const unsigned char *data; size_t length;
                        getData(data, length);
                        print("field.%s", CssmOid((unsigned char *)data, length).toOid().c_str());
                }
                {
                        const unsigned char *data; size_t length;
                        getData(data, length);
                        print("field.%s", CssmOid((unsigned char *)data, length).toOid().c_str());
                }

+#endif

                print("]"); match();
                break;
        case opCertPolicy:
                print("certificate"); certSlot(); print("[");
                print("]"); match();
                break;
        case opCertPolicy:
                print("certificate"); certSlot(); print("[");

+#if TARGET_OS_OSX

                {
                        const unsigned char *data; size_t length;
                        getData(data, length);
                        print("policy.%s", CssmOid((unsigned char *)data, length).toOid().c_str());
                }
                {
                        const unsigned char *data; size_t length;
                        getData(data, length);
                        print("policy.%s", CssmOid((unsigned char *)data, length).toOid().c_str());
                }

+#endif

                print("]"); match();
                break;
        case opTrustedCert:
                print("]"); match();
                break;
        case opTrustedCert:


@@ -333,7 +337,7 @@ void Dumper::data(PrintMode bestMode /* = isSimple */, bool dotOkay /* = false *
                
        switch (bestMode) {
        case isSimple:
                
        switch (bestMode) {
        case isSimple:

-               print("%.*s", length, data);
+               print("%.*s", (int)length, data);

                break;
        case isPrintable:
                print("\"");
                break;
        case isPrintable:
                print("\"");