diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-05-10 15:17:18 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2016-05-10 15:17:18 +0200 |
| commit | 3ac0bc90372f7a6251b8e749f3fceb78375a589a (patch) | |
| tree | 7aa952d61cdc5a215a5b6c8a7847bf0b200890bb /lib/x509/dn.c | |
| parent | 33bb8877f9213df23668eb21c4ebec5b1f5c77a6 (diff) | |
| download | gnutls-3ac0bc90372f7a6251b8e749f3fceb78375a589a.tar.gz | |
Revert "x509: allow empty DNs on parsing for subject DNs"
This reverts commit 1641ea943079765d601cf418dc2c89c1c93f0ecf.
Diffstat (limited to 'lib/x509/dn.c')
| -rw-r--r-- | lib/x509/dn.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/x509/dn.c b/lib/x509/dn.c index 5e0b7026ff..5e6242698c 100644 --- a/lib/x509/dn.c +++ b/lib/x509/dn.c @@ -227,7 +227,7 @@ _gnutls_x509_get_dn(ASN1_TYPE asn1_struct, int _gnutls_x509_parse_dn(ASN1_TYPE asn1_struct, const char *asn1_rdn_name, char *buf, - size_t * buf_size, unsigned allow_empty) + size_t * buf_size) { int ret; gnutls_datum_t dn = {NULL, 0}; @@ -243,14 +243,8 @@ _gnutls_x509_parse_dn(ASN1_TYPE asn1_struct, *buf_size = 0; ret = _gnutls_x509_get_dn(asn1_struct, asn1_rdn_name, &dn); - if (ret < 0) { - if (allow_empty && ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE) { - gnutls_assert(); - *buf_size = 0; - return 0; - } + if (ret < 0) return gnutls_assert_val(ret); - } if (dn.size >= (unsigned int) *buf_size) { gnutls_assert(); @@ -870,7 +864,7 @@ gnutls_x509_rdn_get(const gnutls_datum_t * idn, return _gnutls_asn2err(result); } - result = _gnutls_x509_parse_dn(dn, "rdnSequence", buf, buf_size, 0); + result = _gnutls_x509_parse_dn(dn, "rdnSequence", buf, buf_size); asn1_delete_structure(&dn); return result; |