← Back to branch summary

~hartmans/moonshot/mech_eap-debian-dep-fix

« back to all changes in this revision

Viewing changes to mech_eap/accept_sec_context.c

  • Committer: Sam Hartman
  • Date: 2014-08-01 21:48:22 UTC
  • mfrom: (49.1.20)
  • Revision ID: hartmans@debian.org-20140801214822-s4q75rxhxda8twkk
* new upstream release
  - Includes support for CA certificates.
* Ignore TLS errors before TLS calls are made
* fix assert failure
* Permit 1-component service names
* Enable sha256 in libeap
* Update from upstream to fix segfault on no hostname
* Send flags token with mutual authentication forced

* Fix segfault (LP: #1237981
  )
* Create moonshot-gss-eap-dbg

Show diffs side-by-side

added added

removed removed

Lines of Context:
mech_eap/accept_sec_context.c
345
345
 
346
346
    krbPrinc = ctx->acceptorName->krbPrincipal;
347
347
    GSSEAP_ASSERT(krbPrinc != NULL);
348
 
    GSSEAP_ASSERT(KRB_PRINC_LENGTH(krbPrinc) >= 2);
 
348
    GSSEAP_ASSERT(KRB_PRINC_LENGTH(krbPrinc) >= 1);
349
349
 
350
350
    /* Acceptor-Service-Name */
351
351
    krbPrincComponentToGssBuffer(krbPrinc, 0, &nameBuf);
358
358
        return major;
359
359
 
360
360
    /* Acceptor-Host-Name */
361
 
    krbPrincComponentToGssBuffer(krbPrinc, 1, &nameBuf);
362
 
 
363
 
    major = gssEapRadiusAddAvp(minor, req,
364
 
                               PW_GSS_ACCEPTOR_HOST_NAME,
365
 
                               0,
366
 
                               &nameBuf);
367
 
    if (GSS_ERROR(major))
368
 
        return major;
369
 
 
 
361
    if (KRB_PRINC_LENGTH(krbPrinc) >= 2) {
 
362
        krbPrincComponentToGssBuffer(krbPrinc, 1, &nameBuf);
 
363
 
 
364
        major = gssEapRadiusAddAvp(minor, req,
 
365
                                   PW_GSS_ACCEPTOR_HOST_NAME,
 
366
                                   0,
 
367
                                   &nameBuf);
 
368
        if (GSS_ERROR(major))
 
369
            return major;
 
370
    }
370
371
    if (KRB_PRINC_LENGTH(krbPrinc) > 2) {
371
372
        /* Acceptor-Service-Specific */
372
373
        *minor = krbPrincUnparseServiceSpecifics(krbContext,