diff options
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_cpols.c')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_cpols.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_cpols.c b/src/lib/libcrypto/x509v3/v3_cpols.c index a40f490aa9..867525f336 100644 --- a/src/lib/libcrypto/x509v3/v3_cpols.c +++ b/src/lib/libcrypto/x509v3/v3_cpols.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * project 1999. | 3 | * project 1999. |
4 | */ | 4 | */ |
5 | /* ==================================================================== | 5 | /* ==================================================================== |
6 | * Copyright (c) 1999-2004 The OpenSSL Project. All rights reserved. | 6 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. |
7 | * | 7 | * |
8 | * Redistribution and use in source and binary forms, with or without | 8 | * Redistribution and use in source and binary forms, with or without |
9 | * modification, are permitted provided that the following conditions | 9 | * modification, are permitted provided that the following conditions |
@@ -63,8 +63,6 @@ | |||
63 | #include <openssl/asn1t.h> | 63 | #include <openssl/asn1t.h> |
64 | #include <openssl/x509v3.h> | 64 | #include <openssl/x509v3.h> |
65 | 65 | ||
66 | #include "pcy_int.h" | ||
67 | |||
68 | /* Certificate policies extension support: this one is a bit complex... */ | 66 | /* Certificate policies extension support: this one is a bit complex... */ |
69 | 67 | ||
70 | static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol, BIO *out, int indent); | 68 | static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol, BIO *out, int indent); |
@@ -77,7 +75,7 @@ static POLICYQUALINFO *notice_section(X509V3_CTX *ctx, | |||
77 | STACK_OF(CONF_VALUE) *unot, int ia5org); | 75 | STACK_OF(CONF_VALUE) *unot, int ia5org); |
78 | static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos); | 76 | static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos); |
79 | 77 | ||
80 | const X509V3_EXT_METHOD v3_cpols = { | 78 | X509V3_EXT_METHOD v3_cpols = { |
81 | NID_certificate_policies, 0,ASN1_ITEM_ref(CERTIFICATEPOLICIES), | 79 | NID_certificate_policies, 0,ASN1_ITEM_ref(CERTIFICATEPOLICIES), |
82 | 0,0,0,0, | 80 | 0,0,0,0, |
83 | 0,0, | 81 | 0,0, |
@@ -350,7 +348,7 @@ static int nref_nos(STACK_OF(ASN1_INTEGER) *nnums, STACK_OF(CONF_VALUE) *nos) | |||
350 | return 1; | 348 | return 1; |
351 | 349 | ||
352 | merr: | 350 | merr: |
353 | X509V3err(X509V3_F_NREF_NOS,ERR_R_MALLOC_FAILURE); | 351 | X509V3err(X509V3_F_NOTICE_SECTION,ERR_R_MALLOC_FAILURE); |
354 | 352 | ||
355 | err: | 353 | err: |
356 | sk_ASN1_INTEGER_pop_free(nnums, ASN1_STRING_free); | 354 | sk_ASN1_INTEGER_pop_free(nnums, ASN1_STRING_free); |
@@ -431,19 +429,3 @@ static void print_notice(BIO *out, USERNOTICE *notice, int indent) | |||
431 | notice->exptext->data); | 429 | notice->exptext->data); |
432 | } | 430 | } |
433 | 431 | ||
434 | void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent) | ||
435 | { | ||
436 | const X509_POLICY_DATA *dat = node->data; | ||
437 | |||
438 | BIO_printf(out, "%*sPolicy: ", indent, ""); | ||
439 | |||
440 | i2a_ASN1_OBJECT(out, dat->valid_policy); | ||
441 | BIO_puts(out, "\n"); | ||
442 | BIO_printf(out, "%*s%s\n", indent + 2, "", | ||
443 | node_data_critical(dat) ? "Critical" : "Non Critical"); | ||
444 | if (dat->qualifier_set) | ||
445 | print_qualifiers(out, dat->qualifier_set, indent + 2); | ||
446 | else | ||
447 | BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, ""); | ||
448 | } | ||
449 | |||