
This commit _mostly_ fixes the Heimdal ASN.1 compiler to properly support IMPLICIT tagging in most if not all the many cases where it didn't already, as you could see in lib/asn1/canthandle.asn1 prior to this commit. This fix is a bit of a hack in that a proper fix would change the function prototypes of the encode/decode/length functions generated by the compiler to take an optional IMPLICIT tag to tag with instead of the type they code. That fix would not be localized to lib/asn1/ however, and would change the API and ABI of generated code (which is mostly not an ABI for Heimdal, but still, some external projects would have to make changes). Instead, for IMPLICIT tags we currently depend on the IMPLICIT tag and the sub-type's tag having the same size -- this can be fixed with extra allocation on the encoder side as we do on the decoder side, but we might leave it for later. The issue we're fixing manifested as: -- The [CONTEXT 0] tag in Bar below was turned into an EXPLICIT tag -- instead of an IMPLICIT one, netting the DER encoding for the `foo` -- member as: -- [CONTEXT 0] [UNIVERSAL Seq] [UNIVERSAL Int] <encoding of i> -- instead of the correct: -- [CONTEXT 0] [UNIVERSAL Int] <encoding of i> Foo ::= SEQUENCE { i INTEGER } Bar ::= SEQUENCE { foo [0] IMPLICIT Foo } or Foo ::= INTEGER Bar ::= SEQUENCE { foo [0] IMPLICIT Foo } -- tag context 0 marked -- constructed! I've reviewed this in part by reviewing the output of the compiler before and after this change using this procedure: - Run an earlier version of the ASN.1 compiler output for all modules in lib/asn1/. Save these in a different location. - Run this (or later) version of the ASN.1 compiler output for the same modules, adding --original-order for modules that have been manually sorted already (e.g., rfc2459.asn1). - Run clang-format on the saved and newest generated C source and header files. - Diff the generated output. Substantial differences will relate to handling of IMPLICIT tagging. These are particularly evident in the tcg.asn1 module, which uses a lot of those. Later commits add test data (certificates with extensions that use IMPLICIT tagging) taken from external specifications as well, which exercise this fix. Non-urgent brokenness yet to be fixed: - When the IMPLICIT tag and the tag of the underlying type require differing numbers of bytes to encode, the encoding and decoding will fail. The prototypes of generated length_*() functions make it impossible to do much better. - SET OF <primitive> still crashes the compiler (not a new bug). Futures: - Unwind hackery in cms.asn1 that worked around our lack of proper IMPLICIT tagging support. Here are some of the generated code deltas one expects to see around this commit: $ git checkout $earlier_version $ ./autogen.sh $ mkdir build $ cd build $ ../configure ... $ make -j4 $ make check $ cd lib/asn1 $ for i in *.c; do [[ $i = asn1parse.? || $i = lex.? || $i = *.h ]] && continue clang-format -i $i $i cmp /tmp/save/$i $i && echo NO DIFFS: $i && continue; echo DIFF: $i done NO DIFFS: asn1_cms_asn1.c NO DIFFS: asn1_digest_asn1.c NO DIFFS: asn1_err.c NO DIFFS: asn1_krb5_asn1.c /tmp/save/asn1_kx509_asn1.c asn1_kx509_asn1.c differ: byte 6433, line 264 DIFF: asn1_kx509_asn1.c NO DIFFS: asn1_ocsp_asn1.c NO DIFFS: asn1_pkcs10_asn1.c /tmp/save/asn1_pkcs12_asn1.c asn1_pkcs12_asn1.c differ: byte 12934, line 455 DIFF: asn1_pkcs12_asn1.c NO DIFFS: asn1_pkcs8_asn1.c NO DIFFS: asn1_pkcs9_asn1.c NO DIFFS: asn1_pkinit_asn1.c /tmp/save/asn1_rfc2459_asn1.c asn1_rfc2459_asn1.c differ: byte 20193, line 532 DIFF: asn1_rfc2459_asn1.c NO DIFFS: asn1_rfc4043_asn1.c /tmp/save/asn1_rfc4108_asn1.c asn1_rfc4108_asn1.c differ: byte 595, line 26 DIFF: asn1_rfc4108_asn1.c /tmp/save/asn1_tcg_asn1.c asn1_tcg_asn1.c differ: byte 31835, line 1229 DIFF: asn1_tcg_asn1.c /tmp/save/asn1_test_asn1.c asn1_test_asn1.c differ: byte 384, line 21 DIFF: asn1_test_asn1.c /tmp/save/test_template_asn1-template.c test_template_asn1-template.c differ: byte 650, line 20 DIFF: test_template_asn1-template.c $ $ cd ../.. $ git checkout $newer_version $ make -j4 && make check $ cd lib/asn1 $ for i in *.[ch]; do [[ $i = asn1parse.? || $i = lex.? || $i = *.h ]] && continue clang-format -i $i $i cmp /tmp/save/$i $i && echo NO DIFFS: $i && continue diff -ubw /tmp/save/$i $i done | $PAGER and one should see deltas such as the following: - a small enhancement to handling of OPTIONAL members: (data)->macData = calloc(1, sizeof(*(data)->macData)); if ((data)->macData == NULL) goto fail; e = decode_PKCS12_MacData(p, len, (data)->macData, &l); - if (e) { + if (e == ASN1_MISSING_FIELD) { free((data)->macData); (data)->macData = NULL; + } else if (e) { + goto fail; } else { p += l; len -= l; ret += l; - more complete handling of DEFAULTed members: e = decode_FWReceiptVersion(p, len, &(data)->version, &l); - if (e) + if (e == ASN1_MISSING_FIELD) { + (data)->version = 1; + } else if (e) { goto fail; - p += l; - len -= l; - ret += l; + } else { + p += l; + len -= l; + ret += l; + } { - replacement of tags with implicit tags (encode side): /* targetUri */ if ((data)->targetUri) { size_t Top_tag_oldret HEIMDAL_UNUSED_ATTRIBUTE = ret; ret = 0; e = encode_URIReference(p, len, (data)->targetUri, &l); if (e) return e; p -= l; len -= l; ret += l; - e = der_put_length_and_tag(p, len, ret, ASN1_C_CONTEXT, PRIM, 4, &l); + e = der_replace_tag(p, len, ASN1_C_CONTEXT, CONS, 4); if (e) return e; p -= l; len -= l; ret += l; ret += Top_tag_oldret; } - replacement of tags with implicit tags (decode side): strengthOfFunction_oldlen = len; if (strengthOfFunction_datalen > len) { e = ASN1_OVERRUN; goto fail; } len = strengthOfFunction_datalen; - e = decode_StrengthOfFunction(p, len, (data)->strengthOfFunction, &l); - if (e) - goto fail; - p += l; - len -= l; - ret += l; + { + unsigned char *pcopy; + pcopy = calloc(1, len); + if (pcopy == 0) { + e = ENOMEM; + goto fail; + } + memcpy(pcopy, p, len); + e = der_replace_tag(pcopy, len, ASN1_C_UNIV, PRIM, 0); + if (e) + goto fail; + e = decode_StrengthOfFunction(p, len, (data)->strengthOfFunction, &l); + if (e) + goto fail; + p += l; + len -= l; + ret += l; + free(pcopy); + } len = strengthOfFunction_oldlen - strengthOfFunction_datalen; } } { size_t profileOid_datalen, profileOid_oldlen; - correct determination of implicit tag constructed vs no for IMPLICT- tagged named primitive types: { size_t profileUri_datalen, profileUri_oldlen; Der_type profileUri_type; e = der_match_tag_and_length(p, len, ASN1_C_CONTEXT, &profileUri_type, 2, &profileUri_datalen, &l); - if (e == 0 && profileUri_type != PRIM) { + if (e == 0 && profileUri_type != CONS) { e = ASN1_BAD_ID; } if (e) { (data)->profileUri = NULL; } else { (data)->profileUri = calloc(1, sizeof(*(data)->profileUri)); if ((data)->profileUri == NULL) { e = ENOMEM; goto fail; } - correct determination of length of IMPLICT-tagged OIDs: if ((data)->profileOid) { size_t Top_tag_oldret = ret; ret = 0; ret += der_length_oid((data)->profileOid); + ret += 1 + der_length_len(ret); ret += Top_tag_oldret; } These deltas should be examined with the corresponding ASN.1 module at hand, cross-referencing the source code to the ASN.1 type definitions and manually applying X.690 rules to double-check the choices of primitive vs. constructed tag, and the choices of when to replace tags and when not.
574 lines
12 KiB
C
574 lines
12 KiB
C
/*
|
|
* Copyright (c) 1997-2005 Kungliga Tekniska Högskolan
|
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
*
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
*
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* 3. Neither the name of the Institute nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "der_locl.h"
|
|
|
|
RCSID("$Id$");
|
|
|
|
/*
|
|
* All encoding functions take a pointer `p' to first position in
|
|
* which to write, from the right, `len' which means the maximum
|
|
* number of characters we are able to write. The function returns
|
|
* the number of characters written in `size' (if non-NULL).
|
|
* The return value is 0 or an error.
|
|
*/
|
|
|
|
int
|
|
der_put_unsigned (unsigned char *p, size_t len, const unsigned *v, size_t *size)
|
|
{
|
|
unsigned char *base = p;
|
|
unsigned val = *v;
|
|
|
|
if (val) {
|
|
while (len > 0 && val) {
|
|
*p-- = val % 256;
|
|
val /= 256;
|
|
--len;
|
|
}
|
|
if (val != 0)
|
|
return ASN1_OVERFLOW;
|
|
else {
|
|
if(p[1] >= 128) {
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = 0;
|
|
}
|
|
*size = base - p;
|
|
return 0;
|
|
}
|
|
} else if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
else {
|
|
*p = 0;
|
|
*size = 1;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
int
|
|
der_put_unsigned64 (unsigned char *p, size_t len, const uint64_t *v, size_t *size)
|
|
{
|
|
unsigned char *base = p;
|
|
uint64_t val = *v;
|
|
|
|
if (val) {
|
|
while (len > 0 && val) {
|
|
*p-- = val % 256;
|
|
val /= 256;
|
|
--len;
|
|
}
|
|
if (val != 0)
|
|
return ASN1_OVERFLOW;
|
|
else {
|
|
if(p[1] >= 128) {
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = 0;
|
|
}
|
|
*size = base - p;
|
|
return 0;
|
|
}
|
|
} else if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
else {
|
|
*p = 0;
|
|
*size = 1;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
int
|
|
der_put_integer (unsigned char *p, size_t len, const int *v, size_t *size)
|
|
{
|
|
unsigned char *base = p;
|
|
int val = *v;
|
|
|
|
if(val >= 0) {
|
|
do {
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = val % 256;
|
|
len--;
|
|
val /= 256;
|
|
} while(val);
|
|
if(p[1] >= 128) {
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = 0;
|
|
len--;
|
|
}
|
|
} else {
|
|
val = ~val;
|
|
do {
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = ~(val % 256);
|
|
len--;
|
|
val /= 256;
|
|
} while(val);
|
|
if(p[1] < 128) {
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = 0xff;
|
|
len--;
|
|
}
|
|
}
|
|
*size = base - p;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_integer64 (unsigned char *p, size_t len, const int64_t *v, size_t *size)
|
|
{
|
|
unsigned char *base = p;
|
|
int64_t val = *v;
|
|
|
|
if(val >= 0) {
|
|
do {
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = val % 256;
|
|
len--;
|
|
val /= 256;
|
|
} while(val);
|
|
if(p[1] >= 128) {
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = 0;
|
|
len--;
|
|
}
|
|
} else {
|
|
val = ~val;
|
|
do {
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = ~(val % 256);
|
|
len--;
|
|
val /= 256;
|
|
} while(val);
|
|
if(p[1] < 128) {
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = 0xff;
|
|
len--;
|
|
}
|
|
}
|
|
*size = base - p;
|
|
return 0;
|
|
}
|
|
|
|
|
|
int
|
|
der_put_length (unsigned char *p, size_t len, size_t val, size_t *size)
|
|
{
|
|
if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
|
|
if (val < 128) {
|
|
*p = val;
|
|
*size = 1;
|
|
} else {
|
|
size_t l = 0;
|
|
|
|
while(val > 0) {
|
|
if(len < 2)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = val % 256;
|
|
val /= 256;
|
|
len--;
|
|
l++;
|
|
}
|
|
*p = 0x80 | l;
|
|
if(size)
|
|
*size = l + 1;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_boolean(unsigned char *p, size_t len, const int *data, size_t *size)
|
|
{
|
|
if(len < 1)
|
|
return ASN1_OVERFLOW;
|
|
if(*data != 0)
|
|
*p = 0xff;
|
|
else
|
|
*p = 0;
|
|
*size = 1;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_general_string (unsigned char *p, size_t len,
|
|
const heim_general_string *str, size_t *size)
|
|
{
|
|
size_t slen = strlen(*str);
|
|
|
|
if (len < slen)
|
|
return ASN1_OVERFLOW;
|
|
p -= slen;
|
|
memcpy (p+1, *str, slen);
|
|
*size = slen;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_utf8string (unsigned char *p, size_t len,
|
|
const heim_utf8_string *str, size_t *size)
|
|
{
|
|
return der_put_general_string(p, len, str, size);
|
|
}
|
|
|
|
int
|
|
der_put_printable_string (unsigned char *p, size_t len,
|
|
const heim_printable_string *str, size_t *size)
|
|
{
|
|
return der_put_octet_string(p, len, str, size);
|
|
}
|
|
|
|
int
|
|
der_put_ia5_string (unsigned char *p, size_t len,
|
|
const heim_ia5_string *str, size_t *size)
|
|
{
|
|
return der_put_octet_string(p, len, str, size);
|
|
}
|
|
|
|
int
|
|
der_put_bmp_string (unsigned char *p, size_t len,
|
|
const heim_bmp_string *data, size_t *size)
|
|
{
|
|
size_t i;
|
|
if (len / 2 < data->length)
|
|
return ASN1_OVERFLOW;
|
|
p -= data->length * 2;
|
|
for (i = 0; i < data->length; i++) {
|
|
p[1] = (data->data[i] >> 8) & 0xff;
|
|
p[2] = data->data[i] & 0xff;
|
|
p += 2;
|
|
}
|
|
if (size) *size = data->length * 2;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_universal_string (unsigned char *p, size_t len,
|
|
const heim_universal_string *data, size_t *size)
|
|
{
|
|
size_t i;
|
|
if (len / 4 < data->length)
|
|
return ASN1_OVERFLOW;
|
|
p -= data->length * 4;
|
|
for (i = 0; i < data->length; i++) {
|
|
p[1] = (data->data[i] >> 24) & 0xff;
|
|
p[2] = (data->data[i] >> 16) & 0xff;
|
|
p[3] = (data->data[i] >> 8) & 0xff;
|
|
p[4] = data->data[i] & 0xff;
|
|
p += 4;
|
|
}
|
|
if (size) *size = data->length * 4;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_visible_string (unsigned char *p, size_t len,
|
|
const heim_visible_string *str, size_t *size)
|
|
{
|
|
return der_put_general_string(p, len, str, size);
|
|
}
|
|
|
|
int
|
|
der_put_octet_string (unsigned char *p, size_t len,
|
|
const heim_octet_string *data, size_t *size)
|
|
{
|
|
if (len < data->length)
|
|
return ASN1_OVERFLOW;
|
|
p -= data->length;
|
|
memcpy (p+1, data->data, data->length);
|
|
*size = data->length;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_heim_integer (unsigned char *p, size_t len,
|
|
const heim_integer *data, size_t *size)
|
|
{
|
|
unsigned char *buf = data->data;
|
|
int hibitset = 0;
|
|
|
|
if (data->length == 0) {
|
|
if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = 0;
|
|
if (size)
|
|
*size = 1;
|
|
return 0;
|
|
}
|
|
if (len < data->length)
|
|
return ASN1_OVERFLOW;
|
|
|
|
len -= data->length;
|
|
|
|
if (data->negative) {
|
|
ssize_t i;
|
|
int carry;
|
|
for (i = data->length - 1, carry = 1; i >= 0; i--) {
|
|
*p = buf[i] ^ 0xff;
|
|
if (carry)
|
|
carry = !++*p;
|
|
p--;
|
|
}
|
|
if (p[1] < 128) {
|
|
if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = 0xff;
|
|
len--;
|
|
hibitset = 1;
|
|
}
|
|
} else {
|
|
p -= data->length;
|
|
memcpy(p + 1, buf, data->length);
|
|
|
|
if (p[1] >= 128) {
|
|
if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
p[0] = 0;
|
|
len--;
|
|
hibitset = 1;
|
|
}
|
|
}
|
|
if (size)
|
|
*size = data->length + hibitset;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_generalized_time (unsigned char *p, size_t len,
|
|
const time_t *data, size_t *size)
|
|
{
|
|
heim_octet_string k;
|
|
size_t l;
|
|
int e;
|
|
|
|
e = _heim_time2generalizedtime (*data, &k, 1);
|
|
if (e)
|
|
return e;
|
|
e = der_put_octet_string(p, len, &k, &l);
|
|
free(k.data);
|
|
if(e)
|
|
return e;
|
|
if(size)
|
|
*size = l;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_utctime (unsigned char *p, size_t len,
|
|
const time_t *data, size_t *size)
|
|
{
|
|
heim_octet_string k;
|
|
size_t l;
|
|
int e;
|
|
|
|
e = _heim_time2generalizedtime (*data, &k, 0);
|
|
if (e)
|
|
return e;
|
|
e = der_put_octet_string(p, len, &k, &l);
|
|
free(k.data);
|
|
if(e)
|
|
return e;
|
|
if(size)
|
|
*size = l;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_oid (unsigned char *p, size_t len,
|
|
const heim_oid *data, size_t *size)
|
|
{
|
|
unsigned char *base = p;
|
|
size_t n;
|
|
|
|
for (n = data->length - 1; n >= 2; --n) {
|
|
unsigned u = data->components[n];
|
|
|
|
if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = u % 128;
|
|
u /= 128;
|
|
--len;
|
|
while (u > 0) {
|
|
if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = 128 + u % 128;
|
|
u /= 128;
|
|
--len;
|
|
}
|
|
}
|
|
if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = 40 * data->components[0] + data->components[1];
|
|
*size = base - p;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_replace_tag(unsigned char *p, size_t len, Der_class class, Der_type type,
|
|
unsigned int tag)
|
|
{
|
|
Der_class found_class;
|
|
Der_type found_type;
|
|
unsigned int found_tag;
|
|
size_t found_size, actual_size;
|
|
int e;
|
|
|
|
e = der_get_tag(p, len, &found_class, &found_type, &found_tag,
|
|
&found_size);
|
|
if (e == 0)
|
|
e = der_put_tag(p, len, class, type, tag, &actual_size);
|
|
if (e == 0 && actual_size != found_size)
|
|
e = ASN1_OVERFLOW;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_tag (unsigned char *p, size_t len, Der_class class, Der_type type,
|
|
unsigned int tag, size_t *size)
|
|
{
|
|
if (tag <= 30) {
|
|
if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p = MAKE_TAG(class, type, tag);
|
|
*size = 1;
|
|
} else {
|
|
size_t ret = 0;
|
|
unsigned int continuation = 0;
|
|
|
|
do {
|
|
if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = tag % 128 | continuation;
|
|
len--;
|
|
ret++;
|
|
tag /= 128;
|
|
continuation = 0x80;
|
|
} while(tag > 0);
|
|
if (len < 1)
|
|
return ASN1_OVERFLOW;
|
|
*p-- = MAKE_TAG(class, type, 0x1f);
|
|
ret++;
|
|
*size = ret;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_length_and_tag (unsigned char *p, size_t len, size_t len_val,
|
|
Der_class class, Der_type type,
|
|
unsigned int tag, size_t *size)
|
|
{
|
|
size_t ret = 0;
|
|
size_t l;
|
|
int e;
|
|
|
|
e = der_put_length (p, len, len_val, &l);
|
|
if(e)
|
|
return e;
|
|
p -= l;
|
|
len -= l;
|
|
ret += l;
|
|
e = der_put_tag (p, len, class, type, tag, &l);
|
|
if(e)
|
|
return e;
|
|
|
|
ret += l;
|
|
*size = ret;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
_heim_time2generalizedtime (time_t t, heim_octet_string *s, int gtimep)
|
|
{
|
|
struct tm tm;
|
|
const size_t len = gtimep ? 15 : 13;
|
|
|
|
s->data = NULL;
|
|
s->length = 0;
|
|
if (_der_gmtime(t, &tm) == NULL)
|
|
return ASN1_BAD_TIMEFORMAT;
|
|
s->data = malloc(len + 1);
|
|
if (s->data == NULL)
|
|
return ENOMEM;
|
|
s->length = len;
|
|
if (gtimep)
|
|
snprintf (s->data, len + 1, "%04d%02d%02d%02d%02d%02dZ",
|
|
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
|
|
tm.tm_hour, tm.tm_min, tm.tm_sec);
|
|
else
|
|
snprintf (s->data, len + 1, "%02d%02d%02d%02d%02d%02dZ",
|
|
tm.tm_year % 100, tm.tm_mon + 1, tm.tm_mday,
|
|
tm.tm_hour, tm.tm_min, tm.tm_sec);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
der_put_bit_string (unsigned char *p, size_t len,
|
|
const heim_bit_string *data, size_t *size)
|
|
{
|
|
size_t data_size = (data->length + 7) / 8;
|
|
if (len < data_size + 1)
|
|
return ASN1_OVERFLOW;
|
|
p -= data_size + 1;
|
|
|
|
memcpy (p+2, data->data, data_size);
|
|
if (data->length && (data->length % 8) != 0)
|
|
p[1] = 8 - (data->length % 8);
|
|
else
|
|
p[1] = 0;
|
|
*size = data_size + 1;
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
_heim_der_set_sort(const void *a1, const void *a2)
|
|
{
|
|
const heim_octet_string *s1 = a1, *s2 = a2;
|
|
int ret;
|
|
|
|
ret = memcmp(s1->data, s2->data,
|
|
s1->length < s2->length ? s1->length : s2->length);
|
|
if(ret)
|
|
return ret;
|
|
return (int)(s1->length - s2->length);
|
|
}
|