diff options
Diffstat (limited to 'src/pki/commands/print.c')
| -rw-r--r-- | src/pki/commands/print.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/src/pki/commands/print.c b/src/pki/commands/print.c index b2716f6a8..ee6f30c98 100644 --- a/src/pki/commands/print.c +++ b/src/pki/commands/print.c @@ -15,10 +15,7 @@ #include "pki.h" -<<<<<<< HEAD -======= #include <asn1/asn1.h> ->>>>>>> upstream/4.5.1 #include <credentials/certificates/certificate.h> #include <credentials/certificates/x509.h> #include <credentials/certificates/crl.h> @@ -76,16 +73,11 @@ static void print_x509(x509_t *x509) chunk_t chunk; bool first; char *uri; -<<<<<<< HEAD - int len; - x509_flag_t flags; -======= int len, explicit, inhibit; x509_flag_t flags; x509_cdp_t *cdp; x509_cert_policy_t *policy; x509_policy_mapping_t *mapping; ->>>>>>> upstream/4.5.1 chunk = x509->get_serial(x509); printf("serial: %#B\n", &chunk); @@ -117,13 +109,10 @@ static void print_x509(x509_t *x509) { printf("CA "); } -<<<<<<< HEAD -======= if (flags & X509_CRL_SIGN) { printf("CRLSign "); } ->>>>>>> upstream/4.5.1 if (flags & X509_AA) { printf("AA "); @@ -152,27 +141,15 @@ static void print_x509(x509_t *x509) first = TRUE; enumerator = x509->create_crl_uri_enumerator(x509); -<<<<<<< HEAD - while (enumerator->enumerate(enumerator, &uri)) - { - if (first) - { - printf("CRL URIs: %s\n", uri); -======= while (enumerator->enumerate(enumerator, &cdp)) { if (first) { printf("CRL URIs: %s", cdp->uri); ->>>>>>> upstream/4.5.1 first = FALSE; } else { -<<<<<<< HEAD - printf(" %s\n", uri); - } -======= printf(" %s", cdp->uri); } if (cdp->issuer) @@ -180,7 +157,6 @@ static void print_x509(x509_t *x509) printf(" (CRL issuer: %Y)", cdp->issuer); } printf("\n"); ->>>>>>> upstream/4.5.1 } enumerator->destroy(enumerator); @@ -200,19 +176,12 @@ static void print_x509(x509_t *x509) } enumerator->destroy(enumerator); -<<<<<<< HEAD - len = x509->get_pathLenConstraint(x509); - if (len != X509_NO_PATH_LEN_CONSTRAINT) -======= len = x509->get_constraint(x509, X509_PATH_LEN); if (len != X509_NO_CONSTRAINT) ->>>>>>> upstream/4.5.1 { printf("pathlen: %d\n", len); } -<<<<<<< HEAD -======= first = TRUE; enumerator = x509->create_name_constraint_enumerator(x509, TRUE); while (enumerator->enumerate(enumerator, &id)) @@ -312,7 +281,6 @@ static void print_x509(x509_t *x509) } } ->>>>>>> upstream/4.5.1 chunk = x509->get_authKeyIdentifier(x509); if (chunk.ptr) { @@ -356,16 +324,6 @@ static void print_crl(crl_t *crl) crl_reason_t reason; chunk_t chunk; int count = 0; -<<<<<<< HEAD - char buf[64]; - struct tm tm; - - chunk = crl->get_serial(crl); - printf("serial: %#B\n", &chunk); - chunk = crl->get_authKeyIdentifier(crl); - printf("authKeyId: %#B\n", &chunk); - -======= bool first; char buf[64]; struct tm tm; @@ -401,7 +359,6 @@ static void print_crl(crl_t *crl) } enumerator->destroy(enumerator); ->>>>>>> upstream/4.5.1 enumerator = crl->create_enumerator(crl); while (enumerator->enumerate(enumerator, &chunk, &ts, &reason)) { |