projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
afaad0a
)
Respect ISO aliasing rules.
author
Andy Polyakov
<appro@openssl.org>
Fri, 27 Jul 2007 20:34:10 +0000
(20:34 +0000)
committer
Andy Polyakov
<appro@openssl.org>
Fri, 27 Jul 2007 20:34:10 +0000
(20:34 +0000)
PR: 1296
crypto/asn1/x_name.c
patch
|
blob
|
history
diff --git
a/crypto/asn1/x_name.c
b/crypto/asn1/x_name.c
index 07137ee91e2e4ddb7f577cf1175fcadcd98ed3a1..50d3c7597b2f5e1da45de5466efc17e91ef38b1d 100644
(file)
--- a/
crypto/asn1/x_name.c
+++ b/
crypto/asn1/x_name.c
@@
-185,43
+185,43
@@
static int x509_name_ex_d2i(ASN1_VALUE **val,
int tag, int aclass, char opt, ASN1_TLC *ctx)
{
const unsigned char *p = *in, *q;
int tag, int aclass, char opt, ASN1_TLC *ctx)
{
const unsigned char *p = *in, *q;
- STACK *intname = NULL, **intname_pp = &intname;
+ union { STACK *s; ASN1_VALUE *a; } intname = {NULL};
+ union { X509_NAME *x; ASN1_VALUE *a; } nm = {NULL};
int i, j, ret;
int i, j, ret;
- X509_NAME *nm = NULL, **nm_pp = &nm;
STACK_OF(X509_NAME_ENTRY) *entries;
X509_NAME_ENTRY *entry;
q = p;
/* Get internal representation of Name */
STACK_OF(X509_NAME_ENTRY) *entries;
X509_NAME_ENTRY *entry;
q = p;
/* Get internal representation of Name */
- ret = ASN1_item_ex_d2i(
(ASN1_VALUE **)intname_pp
,
+ ret = ASN1_item_ex_d2i(
&intname.a
,
&p, len, ASN1_ITEM_rptr(X509_NAME_INTERNAL),
tag, aclass, opt, ctx);
if(ret <= 0) return ret;
if(*val) x509_name_ex_free(val, NULL);
&p, len, ASN1_ITEM_rptr(X509_NAME_INTERNAL),
tag, aclass, opt, ctx);
if(ret <= 0) return ret;
if(*val) x509_name_ex_free(val, NULL);
- if(!x509_name_ex_new(
(ASN1_VALUE **)nm_pp
, NULL)) goto err;
+ if(!x509_name_ex_new(
&nm.a
, NULL)) goto err;
/* We've decoded it: now cache encoding */
/* We've decoded it: now cache encoding */
- if(!BUF_MEM_grow(nm->bytes, p - q)) goto err;
- memcpy(nm->bytes->data, q, p - q);
+ if(!BUF_MEM_grow(nm
.x
->bytes, p - q)) goto err;
+ memcpy(nm
.x
->bytes->data, q, p - q);
/* Convert internal representation to X509_NAME structure */
/* Convert internal representation to X509_NAME structure */
- for(i = 0; i < sk_num(intname); i++) {
- entries = (STACK_OF(X509_NAME_ENTRY) *)sk_value(intname, i);
+ for(i = 0; i < sk_num(intname
.s
); i++) {
+ entries = (STACK_OF(X509_NAME_ENTRY) *)sk_value(intname
.s
, i);
for(j = 0; j < sk_X509_NAME_ENTRY_num(entries); j++) {
entry = sk_X509_NAME_ENTRY_value(entries, j);
entry->set = i;
for(j = 0; j < sk_X509_NAME_ENTRY_num(entries); j++) {
entry = sk_X509_NAME_ENTRY_value(entries, j);
entry->set = i;
- if(!sk_X509_NAME_ENTRY_push(nm->entries, entry))
+ if(!sk_X509_NAME_ENTRY_push(nm
.x
->entries, entry))
goto err;
}
sk_X509_NAME_ENTRY_free(entries);
}
goto err;
}
sk_X509_NAME_ENTRY_free(entries);
}
- sk_free(intname);
- ret = x509_name_canon(nm);
+ sk_free(intname
.s
);
+ ret = x509_name_canon(nm
.x
);
if (!ret)
goto err;
if (!ret)
goto err;
- nm->modified = 0;
- *val =
(ASN1_VALUE *)nm
;
+ nm
.x
->modified = 0;
+ *val =
nm.a
;
*in = p;
return ret;
err:
*in = p;
return ret;
err:
@@
-251,35
+251,35
@@
static int x509_name_ex_i2d(ASN1_VALUE **val, unsigned char **out, const ASN1_IT
static int x509_name_encode(X509_NAME *a)
{
static int x509_name_encode(X509_NAME *a)
{
-
STACK *intname = NULL, **intname_pp = &intname
;
+
union { STACK *s; ASN1_VALUE *a; } intname = {NULL}
;
int len;
unsigned char *p;
STACK_OF(X509_NAME_ENTRY) *entries = NULL;
X509_NAME_ENTRY *entry;
int i, set = -1;
int len;
unsigned char *p;
STACK_OF(X509_NAME_ENTRY) *entries = NULL;
X509_NAME_ENTRY *entry;
int i, set = -1;
- intname = sk_new_null();
- if(!intname) goto memerr;
+ intname
.s
= sk_new_null();
+ if(!intname
.s
) goto memerr;
for(i = 0; i < sk_X509_NAME_ENTRY_num(a->entries); i++) {
entry = sk_X509_NAME_ENTRY_value(a->entries, i);
if(entry->set != set) {
entries = sk_X509_NAME_ENTRY_new_null();
if(!entries) goto memerr;
for(i = 0; i < sk_X509_NAME_ENTRY_num(a->entries); i++) {
entry = sk_X509_NAME_ENTRY_value(a->entries, i);
if(entry->set != set) {
entries = sk_X509_NAME_ENTRY_new_null();
if(!entries) goto memerr;
- if(!sk_push(intname, (char *)entries)) goto memerr;
+ if(!sk_push(intname
.s
, (char *)entries)) goto memerr;
set = entry->set;
}
if(!sk_X509_NAME_ENTRY_push(entries, entry)) goto memerr;
}
set = entry->set;
}
if(!sk_X509_NAME_ENTRY_push(entries, entry)) goto memerr;
}
- len = ASN1_item_ex_i2d(
(ASN1_VALUE **)intname_pp
, NULL,
+ len = ASN1_item_ex_i2d(
&intname.a
, NULL,
ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);
if (!BUF_MEM_grow(a->bytes,len)) goto memerr;
p=(unsigned char *)a->bytes->data;
ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);
if (!BUF_MEM_grow(a->bytes,len)) goto memerr;
p=(unsigned char *)a->bytes->data;
- ASN1_item_ex_i2d(
(ASN1_VALUE **)intname_pp
,
+ ASN1_item_ex_i2d(
&intname.a
,
&p, ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);
&p, ASN1_ITEM_rptr(X509_NAME_INTERNAL), -1, -1);
- sk_pop_free(intname, sk_internal_free);
+ sk_pop_free(intname
.s
, sk_internal_free);
a->modified = 0;
return len;
memerr:
a->modified = 0;
return len;
memerr:
- sk_pop_free(intname, sk_internal_free);
+ sk_pop_free(intname
.s
, sk_internal_free);
ASN1err(ASN1_F_X509_NAME_ENCODE, ERR_R_MALLOC_FAILURE);
return -1;
}
ASN1err(ASN1_F_X509_NAME_ENCODE, ERR_R_MALLOC_FAILURE);
return -1;
}