diff options
author | beck <> | 2000-04-15 06:18:51 +0000 |
---|---|---|
committer | beck <> | 2000-04-15 06:18:51 +0000 |
commit | b608c7f2b175e121f2c22d53341a317153afdc8e (patch) | |
tree | e94b160b3fcd8180df79e4251d68d24d665f0195 /src/lib/libcrypto/x509v3 | |
parent | c8d6701c396cebdcd0d45eac73b762e9498f6b01 (diff) | |
download | openbsd-b608c7f2b175e121f2c22d53341a317153afdc8e.tar.gz openbsd-b608c7f2b175e121f2c22d53341a317153afdc8e.tar.bz2 openbsd-b608c7f2b175e121f2c22d53341a317153afdc8e.zip |
OpenSSL 0.9.5a merge
Diffstat (limited to 'src/lib/libcrypto/x509v3')
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_purp.c | 9 | ||||
-rw-r--r-- | src/lib/libcrypto/x509v3/v3err.c | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/x509v3/x509v3.h | 7 |
3 files changed, 14 insertions, 5 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_purp.c b/src/lib/libcrypto/x509v3/v3_purp.c index b7494ebcd5..5594a1d64f 100644 --- a/src/lib/libcrypto/x509v3/v3_purp.c +++ b/src/lib/libcrypto/x509v3/v3_purp.c | |||
@@ -71,6 +71,7 @@ static int purpose_smime(X509 *x, int ca); | |||
71 | static int check_purpose_smime_sign(X509_PURPOSE *xp, X509 *x, int ca); | 71 | static int check_purpose_smime_sign(X509_PURPOSE *xp, X509 *x, int ca); |
72 | static int check_purpose_smime_encrypt(X509_PURPOSE *xp, X509 *x, int ca); | 72 | static int check_purpose_smime_encrypt(X509_PURPOSE *xp, X509 *x, int ca); |
73 | static int check_purpose_crl_sign(X509_PURPOSE *xp, X509 *x, int ca); | 73 | static int check_purpose_crl_sign(X509_PURPOSE *xp, X509 *x, int ca); |
74 | static int no_check(X509_PURPOSE *xp, X509 *x, int ca); | ||
74 | 75 | ||
75 | static int xp_cmp(X509_PURPOSE **a, X509_PURPOSE **b); | 76 | static int xp_cmp(X509_PURPOSE **a, X509_PURPOSE **b); |
76 | static void xptable_free(X509_PURPOSE *p); | 77 | static void xptable_free(X509_PURPOSE *p); |
@@ -81,7 +82,8 @@ static X509_PURPOSE xstandard[] = { | |||
81 | {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0, check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL}, | 82 | {X509_PURPOSE_NS_SSL_SERVER, X509_TRUST_SSL_SERVER, 0, check_purpose_ns_ssl_server, "Netscape SSL server", "nssslserver", NULL}, |
82 | {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign, "S/MIME signing", "smimesign", NULL}, | 83 | {X509_PURPOSE_SMIME_SIGN, X509_TRUST_EMAIL, 0, check_purpose_smime_sign, "S/MIME signing", "smimesign", NULL}, |
83 | {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0, check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL}, | 84 | {X509_PURPOSE_SMIME_ENCRYPT, X509_TRUST_EMAIL, 0, check_purpose_smime_encrypt, "S/MIME encryption", "smimeencrypt", NULL}, |
84 | {X509_PURPOSE_CRL_SIGN, X509_TRUST_ANY, 0, check_purpose_crl_sign, "CRL signing", "crlsign", NULL}, | 85 | {X509_PURPOSE_CRL_SIGN, X509_TRUST_COMPAT, 0, check_purpose_crl_sign, "CRL signing", "crlsign", NULL}, |
86 | {X509_PURPOSE_ANY, X509_TRUST_DEFAULT, 0, no_check, "Any Purpose", "any", NULL}, | ||
85 | }; | 87 | }; |
86 | 88 | ||
87 | #define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE)) | 89 | #define X509_PURPOSE_COUNT (sizeof(xstandard)/sizeof(X509_PURPOSE)) |
@@ -454,3 +456,8 @@ static int check_purpose_crl_sign(X509_PURPOSE *xp, X509 *x, int ca) | |||
454 | if(ku_reject(x, KU_CRL_SIGN)) return 0; | 456 | if(ku_reject(x, KU_CRL_SIGN)) return 0; |
455 | return 1; | 457 | return 1; |
456 | } | 458 | } |
459 | |||
460 | static int no_check(X509_PURPOSE *xp, X509 *x, int ca) | ||
461 | { | ||
462 | return 1; | ||
463 | } | ||
diff --git a/src/lib/libcrypto/x509v3/v3err.c b/src/lib/libcrypto/x509v3/v3err.c index b7d4e350c4..aa4a605dc4 100644 --- a/src/lib/libcrypto/x509v3/v3err.c +++ b/src/lib/libcrypto/x509v3/v3err.c | |||
@@ -54,7 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes |
57 | * made to it will be overwritten when the script next updates this file. | 57 | * made to it will be overwritten when the script next updates this file, |
58 | * only reason strings will be preserved. | ||
58 | */ | 59 | */ |
59 | 60 | ||
60 | #include <stdio.h> | 61 | #include <stdio.h> |
diff --git a/src/lib/libcrypto/x509v3/x509v3.h b/src/lib/libcrypto/x509v3/x509v3.h index fe01755797..96ceb7c4fb 100644 --- a/src/lib/libcrypto/x509v3/x509v3.h +++ b/src/lib/libcrypto/x509v3/x509v3.h | |||
@@ -179,8 +179,8 @@ union { | |||
179 | } GENERAL_NAME; | 179 | } GENERAL_NAME; |
180 | 180 | ||
181 | typedef struct ACCESS_DESCRIPTION_st { | 181 | typedef struct ACCESS_DESCRIPTION_st { |
182 | ASN1_OBJECT *method; | 182 | ASN1_OBJECT *method; |
183 | GENERAL_NAME *location; | 183 | GENERAL_NAME *location; |
184 | } ACCESS_DESCRIPTION; | 184 | } ACCESS_DESCRIPTION; |
185 | 185 | ||
186 | DECLARE_STACK_OF(GENERAL_NAME) | 186 | DECLARE_STACK_OF(GENERAL_NAME) |
@@ -344,9 +344,10 @@ typedef struct x509_purpose_st { | |||
344 | #define X509_PURPOSE_SMIME_SIGN 4 | 344 | #define X509_PURPOSE_SMIME_SIGN 4 |
345 | #define X509_PURPOSE_SMIME_ENCRYPT 5 | 345 | #define X509_PURPOSE_SMIME_ENCRYPT 5 |
346 | #define X509_PURPOSE_CRL_SIGN 6 | 346 | #define X509_PURPOSE_CRL_SIGN 6 |
347 | #define X509_PURPOSE_ANY 7 | ||
347 | 348 | ||
348 | #define X509_PURPOSE_MIN 1 | 349 | #define X509_PURPOSE_MIN 1 |
349 | #define X509_PURPOSE_MAX 6 | 350 | #define X509_PURPOSE_MAX 7 |
350 | 351 | ||
351 | DECLARE_STACK_OF(X509_PURPOSE) | 352 | DECLARE_STACK_OF(X509_PURPOSE) |
352 | 353 | ||