diff options
author | Dr. Stephen Henson <steve@openssl.org> | 1999-12-29 00:40:28 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 1999-12-29 00:40:28 +0000 |
commit | 6447cce37251e6d947279a3fd6874e59ed0d3d2d (patch) | |
tree | ad2355f136234f3ee11a66556429b66a9ae65a22 /crypto | |
parent | 76997b7dd0011e23fb5ed3a49aa693b1fc33bfb6 (diff) | |
download | openssl-6447cce37251e6d947279a3fd6874e59ed0d3d2d.tar.gz |
Simplify the trust structure: basically zap the bit strings and
represent everything by OIDs.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/asn1/t_x509a.c | 54 | ||||
-rw-r--r-- | crypto/asn1/x_x509a.c | 92 | ||||
-rw-r--r-- | crypto/x509/x509.h | 28 | ||||
-rw-r--r-- | crypto/x509/x509_trs.c | 61 | ||||
-rw-r--r-- | crypto/x509v3/x509v3.h | 1 |
5 files changed, 95 insertions, 141 deletions
diff --git a/crypto/asn1/t_x509a.c b/crypto/asn1/t_x509a.c index 0e342723aa..a18ebb586c 100644 --- a/crypto/asn1/t_x509a.c +++ b/crypto/asn1/t_x509a.c @@ -65,73 +65,37 @@ /* X509_CERT_AUX and string set routines */ -static BIT_STRING_BITNAME tbits[] = { -{X509_TRUST_BIT_ALL, "All Purposes", "all"}, -{X509_TRUST_BIT_SSL_CLIENT, "SSL client", "sslclient"}, -{X509_TRUST_BIT_SSL_SERVER, "SSL server", "sslserver"}, -{X509_TRUST_BIT_EMAIL, "S/MIME email", "email"}, -{X509_TRUST_BIT_OBJECT_SIGN, "Object Signing", "objsign"}, -{-1, NULL, NULL} -}; - -int X509_trust_set_bit_asc(X509 *x, char *str, int value) -{ - int bitnum; - bitnum = ASN1_BIT_STRING_num_asc(str, tbits); - if(bitnum < 0) return 0; - if(x) return X509_trust_set_bit(x, bitnum, value); - return 1; -} - -int X509_reject_set_bit_asc(X509 *x, char *str, int value) -{ - int bitnum; - bitnum = ASN1_BIT_STRING_num_asc(str, tbits); - if(bitnum < 0) return 0; - if(x) return X509_reject_set_bit(x, bitnum, value); - return 1; -} - - int X509_CERT_AUX_print(BIO *out, X509_CERT_AUX *aux, int indent) { char oidstr[80], first; int i; if(!aux) return 1; if(aux->trust) { - BIO_printf(out, "%*sTrusted Uses:\n", indent, ""); - ASN1_BIT_STRING_name_print(out, aux->trust, tbits, indent + 2); - } else BIO_printf(out, "%*sNo Trusted Uses.\n", indent, ""); - if(aux->reject) { - BIO_printf(out, "%*sRejected Uses:\n", indent, ""); - ASN1_BIT_STRING_name_print(out, aux->reject, tbits, indent + 2); - } else BIO_printf(out, "%*sNo Rejected Uses.\n", indent, ""); - if(aux->othertrust) { first = 1; - BIO_printf(out, "%*sOther Trusted Uses:\n%*s", + BIO_printf(out, "%*sTrusted Uses:\n%*s", indent, "", indent + 2, ""); - for(i = 0; i < sk_ASN1_OBJECT_num(aux->othertrust); i++) { + for(i = 0; i < sk_ASN1_OBJECT_num(aux->trust); i++) { if(!first) BIO_puts(out, ", "); else first = 0; OBJ_obj2txt(oidstr, 80, - sk_ASN1_OBJECT_value(aux->othertrust, i), 0); + sk_ASN1_OBJECT_value(aux->trust, i), 0); BIO_puts(out, oidstr); } BIO_puts(out, "\n"); - } - if(aux->otherreject) { + } else BIO_printf(out, "%*sNo Trusted Uses.\n", indent, ""); + if(aux->reject) { first = 1; - BIO_printf(out, "%*sOther Rejected Uses:\n%*s", + BIO_printf(out, "%*sRejected Uses:\n%*s", indent, "", indent + 2, ""); - for(i = 0; i < sk_ASN1_OBJECT_num(aux->otherreject); i++) { + for(i = 0; i < sk_ASN1_OBJECT_num(aux->reject); i++) { if(!first) BIO_puts(out, ", "); else first = 0; OBJ_obj2txt(oidstr, 80, - sk_ASN1_OBJECT_value(aux->otherreject, i), 0); + sk_ASN1_OBJECT_value(aux->reject, i), 0); BIO_puts(out, oidstr); } BIO_puts(out, "\n"); - } + } else BIO_printf(out, "%*sNo Rejected Uses.\n", indent, ""); if(aux->alias) BIO_printf(out, "%*sAlias: %s\n", indent, "", aux->alias->data); return 1; diff --git a/crypto/asn1/x_x509a.c b/crypto/asn1/x_x509a.c index 1b95764251..0535f39d74 100644 --- a/crypto/asn1/x_x509a.c +++ b/crypto/asn1/x_x509a.c @@ -78,16 +78,12 @@ X509_CERT_AUX *d2i_X509_CERT_AUX(X509_CERT_AUX **a, unsigned char **pp, long len M_ASN1_D2I_Init(); M_ASN1_D2I_start_sequence(); - M_ASN1_D2I_get_opt(ret->trust, d2i_ASN1_BIT_STRING, - V_ASN1_BIT_STRING); - M_ASN1_D2I_get_IMP_opt(ret->reject, d2i_ASN1_BIT_STRING,0, - V_ASN1_BIT_STRING); - - M_ASN1_D2I_get_seq_opt_type(ASN1_OBJECT, ret->othertrust, + M_ASN1_D2I_get_seq_opt_type(ASN1_OBJECT, ret->trust, d2i_ASN1_OBJECT, ASN1_OBJECT_free); - M_ASN1_D2I_get_IMP_set_opt_type(ASN1_OBJECT, ret->otherreject, - d2i_ASN1_OBJECT, ASN1_OBJECT_free, 1); + M_ASN1_D2I_get_IMP_set_opt_type(ASN1_OBJECT, ret->reject, + d2i_ASN1_OBJECT, ASN1_OBJECT_free, 0); M_ASN1_D2I_get_opt(ret->alias, d2i_ASN1_UTF8STRING, V_ASN1_UTF8STRING); + M_ASN1_D2I_get_opt(ret->keyid, d2i_ASN1_OCTET_STRING, V_ASN1_OCTET_STRING); M_ASN1_D2I_get_opt(ret->other, d2i_ASN1_TYPE, V_ASN1_SEQUENCE); M_ASN1_D2I_Finish(a, X509_CERT_AUX_free, ASN1_F_D2I_X509_CERT_AUX); @@ -100,9 +96,8 @@ X509_CERT_AUX *X509_CERT_AUX_new() M_ASN1_New_Malloc(ret, X509_CERT_AUX); ret->trust = NULL; ret->reject = NULL; - ret->othertrust = NULL; - ret->otherreject = NULL; ret->alias = NULL; + ret->keyid = NULL; ret->other = NULL; return(ret); M_ASN1_New_Error(ASN1_F_X509_CERT_AUX_NEW); @@ -111,11 +106,10 @@ X509_CERT_AUX *X509_CERT_AUX_new() void X509_CERT_AUX_free(X509_CERT_AUX *a) { if(a == NULL) return; - ASN1_BIT_STRING_free(a->trust); - ASN1_BIT_STRING_free(a->reject); - sk_ASN1_OBJECT_pop_free(a->othertrust, ASN1_OBJECT_free); - sk_ASN1_OBJECT_pop_free(a->otherreject, ASN1_OBJECT_free); + sk_ASN1_OBJECT_pop_free(a->trust, ASN1_OBJECT_free); + sk_ASN1_OBJECT_pop_free(a->reject, ASN1_OBJECT_free); ASN1_UTF8STRING_free(a->alias); + ASN1_OCTET_STRING_free(a->keyid); ASN1_TYPE_free(a->other); Free((char *)a); } @@ -124,24 +118,20 @@ int i2d_X509_CERT_AUX(X509_CERT_AUX *a, unsigned char **pp) { M_ASN1_I2D_vars(a); - M_ASN1_I2D_len(a->trust, i2d_ASN1_BIT_STRING); - M_ASN1_I2D_len_IMP_opt(a->reject, i2d_ASN1_BIT_STRING); - - M_ASN1_I2D_len_SEQUENCE_opt_type(ASN1_OBJECT, a->othertrust, i2d_ASN1_OBJECT); - M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(ASN1_OBJECT, a->otherreject, i2d_ASN1_OBJECT, 1); + M_ASN1_I2D_len_SEQUENCE_opt_type(ASN1_OBJECT, a->trust, i2d_ASN1_OBJECT); + M_ASN1_I2D_len_IMP_SEQUENCE_opt_type(ASN1_OBJECT, a->reject, i2d_ASN1_OBJECT, 0); M_ASN1_I2D_len(a->alias, i2d_ASN1_UTF8STRING); + M_ASN1_I2D_len(a->keyid, i2d_ASN1_OCTET_STRING); M_ASN1_I2D_len(a->other, i2d_ASN1_TYPE); M_ASN1_I2D_seq_total(); - M_ASN1_I2D_put(a->trust, i2d_ASN1_BIT_STRING); - M_ASN1_I2D_put_IMP_opt(a->reject, i2d_ASN1_BIT_STRING, 0); - - M_ASN1_I2D_put_SEQUENCE_opt_type(ASN1_OBJECT, a->othertrust, i2d_ASN1_OBJECT); - M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(ASN1_OBJECT, a->otherreject, i2d_ASN1_OBJECT, 1); + M_ASN1_I2D_put_SEQUENCE_opt_type(ASN1_OBJECT, a->trust, i2d_ASN1_OBJECT); + M_ASN1_I2D_put_IMP_SEQUENCE_opt_type(ASN1_OBJECT, a->reject, i2d_ASN1_OBJECT, 0); M_ASN1_I2D_put(a->alias, i2d_ASN1_UTF8STRING); + M_ASN1_I2D_put(a->keyid, i2d_ASN1_OCTET_STRING); M_ASN1_I2D_put(a->other, i2d_ASN1_TYPE); M_ASN1_I2D_finish(); @@ -169,51 +159,41 @@ unsigned char *X509_alias_get(X509 *x, int *len) return x->aux->alias->data; } -int X509_trust_set_bit(X509 *x, int bit, int value) +int X509_radd_trust_object(X509 *x, ASN1_OBJECT *obj) { X509_CERT_AUX *aux; - if(bit == -1) { - if(x->aux && x->aux->trust) { - ASN1_BIT_STRING_free(x->aux->trust); - x->aux->trust = NULL; - } - return 1; - } + ASN1_OBJECT *objtmp; + if(!(objtmp = OBJ_dup(obj))) return 0; if(!(aux = aux_get(x))) return 0; - if(!aux->trust && !(aux->trust = ASN1_BIT_STRING_new())) return 0; - return ASN1_BIT_STRING_set_bit(aux->trust, bit, value); + if(!aux->trust + && !(aux->trust = sk_ASN1_OBJECT_new_null())) return 0; + return sk_ASN1_OBJECT_push(aux->trust, objtmp); } -int X509_reject_set_bit(X509 *x, int bit, int value) +int X509_radd_reject_object(X509 *x, ASN1_OBJECT *obj) { X509_CERT_AUX *aux; - if(bit == -1) { - if(x->aux && x->aux->reject) { - ASN1_BIT_STRING_free(x->aux->reject); - x->aux->reject = NULL; - } - return 1; - } + ASN1_OBJECT *objtmp; + if(!(objtmp = OBJ_dup(obj))) return 0; if(!(aux = aux_get(x))) return 0; - if(!aux->reject && !(aux->reject = ASN1_BIT_STRING_new())) return 0; - return ASN1_BIT_STRING_set_bit(aux->reject, bit, value); + if(!aux->reject + && !(aux->reject = sk_ASN1_OBJECT_new_null())) return 0; + return sk_ASN1_OBJECT_push(aux->reject, objtmp); } -int X509_add_trust_object(X509 *x, ASN1_OBJECT *obj) +void X509_trust_clear(X509 *x) { - X509_CERT_AUX *aux; - if(!(aux = aux_get(x))) return 0; - if(!aux->othertrust - && !(aux->othertrust = sk_ASN1_OBJECT_new_null())) return 0; - return sk_ASN1_OBJECT_push(aux->othertrust, obj); + if(x->aux && x->aux->trust) { + sk_ASN1_OBJECT_pop_free(x->aux->trust, ASN1_OBJECT_free); + x->aux->trust = NULL; + } } -int X509_add_reject_object(X509 *x, ASN1_OBJECT *obj) +void X509_reject_clear(X509 *x) { - X509_CERT_AUX *aux; - if(!(aux = aux_get(x))) return 0; - if(!aux->otherreject - && !(aux->otherreject = sk_ASN1_OBJECT_new_null())) return 0; - return sk_ASN1_OBJECT_push(aux->otherreject, obj); + if(x->aux && x->aux->reject) { + sk_ASN1_OBJECT_pop_free(x->aux->reject, ASN1_OBJECT_free); + x->aux->reject = NULL; + } } diff --git a/crypto/x509/x509.h b/crypto/x509/x509.h index 90bebb17a8..a11f9bc02c 100644 --- a/crypto/x509/x509.h +++ b/crypto/x509/x509.h @@ -236,22 +236,12 @@ typedef struct x509_cinf_st * the end of the certificate itself */ -/* Bit values for trust/reject */ - -#define X509_TRUST_BIT_ALL 0 -#define X509_TRUST_BIT_SSL_CLIENT 1 -#define X509_TRUST_BIT_SSL_SERVER 2 -#define X509_TRUST_BIT_EMAIL 3 -#define X509_TRUST_BIT_OBJECT_SIGN 4 - - typedef struct x509_cert_aux_st { - ASN1_BIT_STRING *trust; /* trusted uses */ - ASN1_BIT_STRING *reject; /* rejected uses */ - STACK_OF(ASN1_OBJECT) *othertrust; /* extra uses */ - STACK_OF(ASN1_OBJECT) *otherreject; /* extra rejected uses */ + STACK_OF(ASN1_OBJECT) *trust; /* trusted uses */ + STACK_OF(ASN1_OBJECT) *reject; /* rejected uses */ ASN1_UTF8STRING *alias; /* "friendly name" */ + ASN1_OCTET_STRING *keyid; /* key id of private key */ ASN1_TYPE *other; /* other unspecified info */ } X509_CERT_AUX; @@ -830,13 +820,11 @@ X509_CERT_AUX * d2i_X509_CERT_AUX(X509_CERT_AUX **a,unsigned char **pp, long length); int X509_alias_set(X509 *x, unsigned char *name, int len); unsigned char * X509_alias_get(X509 *x, int *len); -int X509_trust_set_bit(X509 *x, int bit, int value); -int X509_reject_set_bit(X509 *x, int bit, int value); -int X509_add_trust_object(X509 *x, ASN1_OBJECT *obj); -int X509_add_reject_object(X509 *x, ASN1_OBJECT *obj); - -int X509_trust_set_bit_asc(X509 *x, char *str, int value); -int X509_reject_set_bit_asc(X509 *x, char *str, int value); +int (*X509_TRUST_set_default(int (*trust)(int , X509 *, int)))(int, X509 *, int); +int X509_radd_trust_object(X509 *x, ASN1_OBJECT *obj); +int X509_radd_reject_object(X509 *x, ASN1_OBJECT *obj); +void X509_trust_clear(X509 *x); +void X509_reject_clear(X509 *x); X509_REVOKED * X509_REVOKED_new(void); void X509_REVOKED_free(X509_REVOKED *a); diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c index f96f5f9b26..8a632db7b0 100644 --- a/crypto/x509/x509_trs.c +++ b/crypto/x509/x509_trs.c @@ -64,9 +64,12 @@ static int tr_cmp(X509_TRUST **a, X509_TRUST **b); static void trtable_free(X509_TRUST *p); -static int trust_1bit(X509_TRUST *trust, X509 *x, int flags); +static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags); static int trust_any(X509_TRUST *trust, X509 *x, int flags); +static int obj_trust(int id, X509 *x, int flags); +static int (*default_trust)(int id, X509 *x, int flags) = obj_trust; + /* WARNING: the following table should be kept in order of trust * and without any gaps so we can just subtract the minimum trust * value to get an index into the table @@ -74,10 +77,9 @@ static int trust_any(X509_TRUST *trust, X509 *x, int flags); static X509_TRUST trstandard[] = { {X509_TRUST_ANY, 0, trust_any, "Any", 0, NULL}, -{X509_TRUST_SSL_CLIENT, 0, trust_1bit, "SSL Client", X509_TRUST_BIT_SSL_CLIENT, NULL}, -{X509_TRUST_SSL_SERVER, 0, trust_1bit, "SSL Client", X509_TRUST_BIT_SSL_SERVER, NULL}, -{X509_TRUST_EMAIL, 0, trust_1bit, "S/MIME email", X509_TRUST_BIT_EMAIL, NULL}, -{X509_TRUST_OBJECT_SIGN, 0, trust_1bit, "Object Signing", X509_TRUST_BIT_OBJECT_SIGN, NULL}, +{X509_TRUST_SSL_CLIENT, 0, trust_1oidany, "SSL Client", NID_client_auth, NULL}, +{X509_TRUST_SSL_SERVER, 0, trust_1oidany, "SSL Client", NID_server_auth, NULL}, +{X509_TRUST_EMAIL, 0, trust_1oidany, "S/MIME email", NID_email_protect, NULL}, }; #define X509_TRUST_COUNT (sizeof(trstandard)/sizeof(X509_TRUST)) @@ -91,12 +93,22 @@ static int tr_cmp(X509_TRUST **a, X509_TRUST **b) return (*a)->trust - (*b)->trust; } +int (*X509_TRUST_set_default(int (*trust)(int , X509 *, int)))(int, X509 *, int) +{ +int (*oldtrust)(int , X509 *, int); +oldtrust = default_trust; +default_trust = trust; +return oldtrust; +} + + int X509_check_trust(X509 *x, int id, int flags) { X509_TRUST *pt; int idx; if(id == -1) return 1; - if(!(idx = X509_TRUST_get_by_id(id))) return 0; + if(!(idx = X509_TRUST_get_by_id(id))) + return default_trust(id, x, flags); pt = X509_TRUST_iget(idx); return pt->check_trust(pt, x, flags); } @@ -212,20 +224,9 @@ int X509_TRUST_get_trust(X509_TRUST *xp) return xp->trust; } -static int trust_1bit(X509_TRUST *trust, X509 *x, int flags) +static int trust_1oidany(X509_TRUST *trust, X509 *x, int flags) { - X509_CERT_AUX *ax; - ax = x->aux; - if(ax) { - if(ax->reject - && ( ASN1_BIT_STRING_get_bit(ax->reject, X509_TRUST_BIT_ALL) - || ASN1_BIT_STRING_get_bit(ax->reject, trust->arg1))) - return X509_TRUST_REJECTED; - if(ax->trust && (ASN1_BIT_STRING_get_bit(ax->trust, X509_TRUST_BIT_ALL) - || ASN1_BIT_STRING_get_bit(ax->trust, trust->arg1))) - return X509_TRUST_TRUSTED; - return X509_TRUST_UNTRUSTED; - } + if(x->aux) return obj_trust(trust->arg1, x, flags); /* we don't have any trust settings: for compatability * we return trusted if it is self signed */ @@ -234,6 +235,28 @@ static int trust_1bit(X509_TRUST *trust, X509 *x, int flags) else return X509_TRUST_UNTRUSTED; } +static int obj_trust(int id, X509 *x, int flags) +{ + ASN1_OBJECT *obj; + int i; + X509_CERT_AUX *ax; + ax = x->aux; + if(!ax) return X509_TRUST_UNTRUSTED; + if(ax->reject) { + for(i = 0; i < sk_ASN1_OBJECT_num(ax->reject); i++) { + obj = sk_ASN1_OBJECT_value(ax->reject, i); + if(OBJ_obj2nid(obj) == id) return X509_TRUST_REJECTED; + } + } + if(ax->trust) { + for(i = 0; i < sk_ASN1_OBJECT_num(ax->trust); i++) { + obj = sk_ASN1_OBJECT_value(ax->trust, i); + if(OBJ_obj2nid(obj) == id) return X509_TRUST_TRUSTED; + } + } + return X509_TRUST_UNTRUSTED; +} + static int trust_any(X509_TRUST *trust, X509 *x, int flags) { return X509_TRUST_TRUSTED; diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 5e988a98b8..b5a89c9cbb 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -542,7 +542,6 @@ char *X509_PURPOSE_iget_name(X509_PURPOSE *xp); char *X509_PURPOSE_iget_sname(X509_PURPOSE *xp); int X509_PURPOSE_get_trust(X509_PURPOSE *xp); void X509_PURPOSE_cleanup(void); -void X509_PURPOSE_add_standard(void); int X509_PURPOSE_get_id(X509_PURPOSE *); /* BEGIN ERROR CODES */ |