Deleted Added
full compact
ssl_lib.c (205128) ssl_lib.c (215697)
1/*! \file ssl/ssl_lib.c
2 * \brief Version independent SSL functions.
3 */
4/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
5 * All rights reserved.
6 *
7 * This package is an SSL implementation written
8 * by Eric Young (eay@cryptsoft.com).

--- 1926 unchanged lines hidden (view full) ---

1935 }
1936
1937 return 1; /* all checks are ok */
1938 }
1939
1940/* THIS NEEDS CLEANING UP */
1941X509 *ssl_get_server_send_cert(SSL *s)
1942 {
1/*! \file ssl/ssl_lib.c
2 * \brief Version independent SSL functions.
3 */
4/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
5 * All rights reserved.
6 *
7 * This package is an SSL implementation written
8 * by Eric Young (eay@cryptsoft.com).

--- 1926 unchanged lines hidden (view full) ---

1935 }
1936
1937 return 1; /* all checks are ok */
1938 }
1939
1940/* THIS NEEDS CLEANING UP */
1941X509 *ssl_get_server_send_cert(SSL *s)
1942 {
1943 unsigned long alg,mask,kalg;
1943 unsigned long alg,kalg;
1944 CERT *c;
1944 CERT *c;
1945 int i,is_export;
1945 int i;
1946
1947 c=s->cert;
1948 ssl_set_cert_masks(c, s->s3->tmp.new_cipher);
1949 alg=s->s3->tmp.new_cipher->algorithms;
1946
1947 c=s->cert;
1948 ssl_set_cert_masks(c, s->s3->tmp.new_cipher);
1949 alg=s->s3->tmp.new_cipher->algorithms;
1950 is_export=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);
1951 mask=is_export?c->export_mask:c->mask;
1952 kalg=alg&(SSL_MKEY_MASK|SSL_AUTH_MASK);
1953
1954 if (kalg & SSL_kECDH)
1955 {
1956 /* we don't need to look at SSL_kECDHE
1957 * since no certificate is needed for
1958 * anon ECDH and for authenticated
1959 * ECDHE, the check for the auth

--- 803 unchanged lines hidden ---
1950 kalg=alg&(SSL_MKEY_MASK|SSL_AUTH_MASK);
1951
1952 if (kalg & SSL_kECDH)
1953 {
1954 /* we don't need to look at SSL_kECDHE
1955 * since no certificate is needed for
1956 * anon ECDH and for authenticated
1957 * ECDHE, the check for the auth

--- 803 unchanged lines hidden ---