Changeset 0ab45ea in mod_gnutls for src


Ignore:
Timestamp:
Jan 11, 2013, 12:56:17 AM (9 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports
Children:
15ffe0b
Parents:
e86847d (diff), dc1e7e6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge tag 'upstream/0.4.2.1'

Upstream version 0.4.2.1

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/gnutls_hooks.c

    re86847d r0ab45ea  
    794794
    795795    apr_table_setn(env,
     796       apr_pstrcat(r->pool, MGS_SIDE, "_CERT_TYPE", NULL), "X.509");
     797#ifdef COMPAT
     798    apr_table_setn(env,
    796799       apr_pstrcat(r->pool, MGS_SIDE, "_S_TYPE", NULL), "X.509");
     800#endif
    797801
    798802    tmp =
     
    836840            if (ret == GNUTLS_SAN_DNSNAME) {
    837841                apr_table_setn(env,
    838                        apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i),
     842                       apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i),
    839843                       apr_psprintf(r->pool, "DNSNAME:%s", tmp2));
    840844            } else if (ret == GNUTLS_SAN_RFC822NAME) {
    841845                apr_table_setn(env,
    842                        apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i),
     846                       apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i),
    843847                       apr_psprintf(r->pool, "RFC822NAME:%s", tmp2));
    844848            } else if (ret == GNUTLS_SAN_URI) {
    845849                apr_table_setn(env,
    846                        apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i),
     850                       apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i),
    847851                       apr_psprintf(r->pool, "URI:%s", tmp2));
    848852            } else {
    849853                apr_table_setn(env,
    850                        apr_psprintf(r->pool, "%s_S_SAN%u", MGS_SIDE, i),
     854                       apr_psprintf(r->pool, "%s_S_AN%u", MGS_SIDE, i),
    851855                       "UNSUPPORTED");
    852856            }
Note: See TracChangeset for help on using the changeset viewer.