Branch: Tag:

2002-01-31

2002-01-31 12:05:13 by Jens Larsson <jens@lysator.liu.se>

Applied patches from [bug 2722 (#2722)].
Thanks to Jens Larsson.

Rev: server/base_server/roxen.pike:1.770

6:   // Per Hedbor, Henrik Grubbström, Pontus Hagland, David Hedbor and others.   // ABS and suicide systems contributed freely by Francesco Chemolli    - constant cvs_version="$Id: roxen.pike,v 1.769 2002/01/11 10:56:35 grubba Exp $"; + constant cvs_version="$Id: roxen.pike,v 1.770 2002/01/31 12:05:13 grubba Exp $";      // The argument cache. Used by the image cache.   ArgCache argcache;
1556: Inside #if constant(SSL.sslfile)
   report_error(LOC_M(13,"SSL3: Certificate not valid (DER).")+"\n");    return;    } -  if (tbs->public_key->rsa->public_key_equal (rsa)) +  if (tbs->public_key->rsa->public_key_equal (rsa)) {    key_matches++; -  else +  // DWIM: Make sure the main cert comes first in the cert list. +  ctx->certificates = ({ cert }) + ctx->certificates; +  } else { +  ctx->certificates += ctx->certificates;    continue;    } -  +  }    else if (part = msg->parts["DSA PRIVATE KEY"])    {    string key;
1588: Inside #if constant(SSL.sslfile)
   ctx->dhe_dss_mode();       // FIXME: Add cert <-> private key check. +  +  ctx->certificates = ({ cert }) + ctx->certificates;    }    else    {
1595: Inside #if constant(SSL.sslfile)
   return;    }    -  ctx->certificates = ({ cert }) + ctx->certificates; +     ctx->random = r;    }    if( !key_matches )