diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2008-02-11 13:59:33 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2008-02-11 13:59:33 +0000 |
commit | 1ad90a916b4e3295173853d5da7f6a68cbad53f1 (patch) | |
tree | 116549f9b3d731de9d70ed66e8914b37ae0115b3 /crypto/asn1 | |
parent | 8ab9025e316706c0c253dd61fc0f56857f4d24d0 (diff) |
Extend attribute setting routines to support non-string types.
Diffstat (limited to 'crypto/asn1')
-rw-r--r-- | crypto/asn1/a_type.c | 29 | ||||
-rw-r--r-- | crypto/asn1/asn1.h | 1 |
2 files changed, 29 insertions, 1 deletions
diff --git a/crypto/asn1/a_type.c b/crypto/asn1/a_type.c index 6a1e5a7a5a..52523d210a 100644 --- a/crypto/asn1/a_type.c +++ b/crypto/asn1/a_type.c @@ -77,9 +77,36 @@ void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value) ASN1_primitive_free((ASN1_VALUE **)tmp_a, NULL); } a->type=type; - a->value.ptr=value; + if (type == V_ASN1_BOOLEAN) + a->value.boolean = value ? 0xff : 0; + else + a->value.ptr=value; } +int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value) + { + if (!value || (type == V_ASN1_BOOLEAN)) + { + ASN1_TYPE_set(a, type, (void *)value); + } + else if (type == V_ASN1_OBJECT) + { + ASN1_OBJECT *odup; + odup = OBJ_dup(value); + if (!odup) + return 0; + ASN1_TYPE_set(a, type, odup); + } + else + { + ASN1_STRING *sdup; + sdup = ASN1_STRING_dup(sdup); + if (!sdup) + return 0; + ASN1_TYPE_set(a, type, sdup); + } + return 1; + } IMPLEMENT_STACK_OF(ASN1_TYPE) IMPLEMENT_ASN1_SET_OF(ASN1_TYPE) diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h index 2adb06e93f..8acf94594f 100644 --- a/crypto/asn1/asn1.h +++ b/crypto/asn1/asn1.h @@ -759,6 +759,7 @@ DECLARE_ASN1_FUNCTIONS_fname(ASN1_TYPE, ASN1_ANY, ASN1_TYPE) int ASN1_TYPE_get(ASN1_TYPE *a); void ASN1_TYPE_set(ASN1_TYPE *a, int type, void *value); +int ASN1_TYPE_set1(ASN1_TYPE *a, int type, const void *value); int ASN1_TYPE_cmp(ASN1_TYPE *a, ASN1_TYPE *b); ASN1_OBJECT * ASN1_OBJECT_new(void ); |