diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-03-09 21:57:25 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-03-09 21:57:25 +0100 |
| commit | 9df4631172fbc02df64d1b0f30bfc3546ec07cae (patch) | |
| tree | 7b8cf6bfe22e4ceb557616e2b461ff218596867d /lib | |
| parent | 80d7af4e25b159a2b233c89047a0ddeddcf7c0c8 (diff) | |
| download | gnutls-9df4631172fbc02df64d1b0f30bfc3546ec07cae.tar.gz | |
depend on libtasn1 4.3
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/x509/common.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/x509/common.c b/lib/x509/common.c index d92290a2ac..55400bfc57 100644 --- a/lib/x509/common.c +++ b/lib/x509/common.c @@ -975,12 +975,10 @@ _gnutls_x509_decode_string(unsigned int etype, unsigned int str_size, len; gnutls_datum_t td; -#ifdef HAVE_ASN1_DECODE_SIMPLE_BER if (allow_ber) ret = asn1_decode_simple_ber(etype, der, der_size, &str, &str_size, NULL); else -#endif ret = asn1_decode_simple_der(etype, der, der_size, (const uint8_t**)&str, &str_size); if (ret != ASN1_SUCCESS) { @@ -997,10 +995,8 @@ _gnutls_x509_decode_string(unsigned int etype, memcpy(td.data, str, str_size); td.data[str_size] = 0; -#ifdef HAVE_ASN1_DECODE_SIMPLE_BER if (allow_ber) free(str); -#endif ret = make_printable_string(etype, &td, output); if (ret == GNUTLS_E_INVALID_REQUEST) { /* unsupported etype */ |