diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_txt.c')
-rw-r--r-- | src/lib/libcrypto/x509/x509_txt.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/lib/libcrypto/x509/x509_txt.c b/src/lib/libcrypto/x509/x509_txt.c index 8caf18a955..31a909a12c 100644 --- a/src/lib/libcrypto/x509/x509_txt.c +++ b/src/lib/libcrypto/x509/x509_txt.c | |||
@@ -5,21 +5,21 @@ | |||
5 | * This package is an SSL implementation written | 5 | * This package is an SSL implementation written |
6 | * by Eric Young (eay@cryptsoft.com). | 6 | * by Eric Young (eay@cryptsoft.com). |
7 | * The implementation was written so as to conform with Netscapes SSL. | 7 | * The implementation was written so as to conform with Netscapes SSL. |
8 | * | 8 | * |
9 | * This library is free for commercial and non-commercial use as long as | 9 | * This library is free for commercial and non-commercial use as long as |
10 | * the following conditions are aheared to. The following conditions | 10 | * the following conditions are aheared to. The following conditions |
11 | * apply to all code found in this distribution, be it the RC4, RSA, | 11 | * apply to all code found in this distribution, be it the RC4, RSA, |
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation |
13 | * included with this distribution is covered by the same copyright terms | 13 | * included with this distribution is covered by the same copyright terms |
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). |
15 | * | 15 | * |
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | 16 | * Copyright remains Eric Young's, and as such any Copyright notices in |
17 | * the code are not to be removed. | 17 | * the code are not to be removed. |
18 | * If this package is used in a product, Eric Young should be given attribution | 18 | * If this package is used in a product, Eric Young should be given attribution |
19 | * as the author of the parts of the library used. | 19 | * as the author of the parts of the library used. |
20 | * This can be in the form of a textual message at program startup or | 20 | * This can be in the form of a textual message at program startup or |
21 | * in documentation (online or textual) provided with the package. | 21 | * in documentation (online or textual) provided with the package. |
22 | * | 22 | * |
23 | * Redistribution and use in source and binary forms, with or without | 23 | * Redistribution and use in source and binary forms, with or without |
24 | * modification, are permitted provided that the following conditions | 24 | * modification, are permitted provided that the following conditions |
25 | * are met: | 25 | * are met: |
@@ -34,10 +34,10 @@ | |||
34 | * Eric Young (eay@cryptsoft.com)" | 34 | * Eric Young (eay@cryptsoft.com)" |
35 | * The word 'cryptographic' can be left out if the rouines from the library | 35 | * The word 'cryptographic' can be left out if the rouines from the library |
36 | * being used are not cryptographic related :-). | 36 | * being used are not cryptographic related :-). |
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | 37 | * 4. If you include any Windows specific code (or a derivative thereof) from |
38 | * the apps directory (application code) you must include an acknowledgement: | 38 | * the apps directory (application code) you must include an acknowledgement: |
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" |
40 | * | 40 | * |
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND |
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
@@ -49,7 +49,7 @@ | |||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
51 | * SUCH DAMAGE. | 51 | * SUCH DAMAGE. |
52 | * | 52 | * |
53 | * The licence and distribution terms for any publically available version or | 53 | * The licence and distribution terms for any publically available version or |
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be |
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
@@ -68,7 +68,8 @@ | |||
68 | #include <openssl/x509.h> | 68 | #include <openssl/x509.h> |
69 | #include <openssl/objects.h> | 69 | #include <openssl/objects.h> |
70 | 70 | ||
71 | const char *X509_verify_cert_error_string(long n) | 71 | const char * |
72 | X509_verify_cert_error_string(long n) | ||
72 | { | 73 | { |
73 | static char buf[100]; | 74 | static char buf[100]; |
74 | 75 | ||
@@ -162,12 +163,11 @@ const char *X509_verify_cert_error_string(long n) | |||
162 | case X509_V_ERR_NO_EXPLICIT_POLICY: | 163 | case X509_V_ERR_NO_EXPLICIT_POLICY: |
163 | return("no explicit policy"); | 164 | return("no explicit policy"); |
164 | case X509_V_ERR_DIFFERENT_CRL_SCOPE: | 165 | case X509_V_ERR_DIFFERENT_CRL_SCOPE: |
165 | return("Different CRL scope"); | 166 | return("Different CRL scope"); |
166 | case X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE: | 167 | case X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE: |
167 | return("Unsupported extension feature"); | 168 | return("Unsupported extension feature"); |
168 | case X509_V_ERR_UNNESTED_RESOURCE: | 169 | case X509_V_ERR_UNNESTED_RESOURCE: |
169 | return("RFC 3779 resource not subset of parent's resources"); | 170 | return("RFC 3779 resource not subset of parent's resources"); |
170 | |||
171 | case X509_V_ERR_PERMITTED_VIOLATION: | 171 | case X509_V_ERR_PERMITTED_VIOLATION: |
172 | return("permitted subtree violation"); | 172 | return("permitted subtree violation"); |
173 | case X509_V_ERR_EXCLUDED_VIOLATION: | 173 | case X509_V_ERR_EXCLUDED_VIOLATION: |
@@ -184,9 +184,7 @@ const char *X509_verify_cert_error_string(long n) | |||
184 | return("CRL path validation error"); | 184 | return("CRL path validation error"); |
185 | 185 | ||
186 | default: | 186 | default: |
187 | snprintf(buf,sizeof buf,"error number %ld",n); | 187 | snprintf(buf, sizeof buf, "error number %ld", n); |
188 | return(buf); | 188 | return (buf); |
189 | } | 189 | } |
190 | } | 190 | } |
191 | |||
192 | |||