projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not undefine _XOPEN_SOURCE. This is currently experimental, and
[openssl.git]
/
ssl
/
d1_srvr.c
diff --git
a/ssl/d1_srvr.c
b/ssl/d1_srvr.c
index 81c1790ab33d5f302272c1d0322047148a66f51a..6d07dd47928fa1bb54e2ab3982a2477b41311a4c 100644
(file)
--- a/
ssl/d1_srvr.c
+++ b/
ssl/d1_srvr.c
@@
-180,7
+180,7
@@
int dtls1_accept(SSL *s)
if (s->cert == NULL)
{
if (s->cert == NULL)
{
- SSLerr(SSL_F_
SSL3
_ACCEPT,SSL_R_NO_CERTIFICATE_SET);
+ SSLerr(SSL_F_
DTLS1
_ACCEPT,SSL_R_NO_CERTIFICATE_SET);
return(-1);
}
return(-1);
}
@@
-204,7
+204,7
@@
int dtls1_accept(SSL *s)
if ((s->version & 0xff00) != (DTLS1_VERSION & 0xff00))
{
if ((s->version & 0xff00) != (DTLS1_VERSION & 0xff00))
{
- SSLerr(SSL_F_
SSL3
_ACCEPT, ERR_R_INTERNAL_ERROR);
+ SSLerr(SSL_F_
DTLS1
_ACCEPT, ERR_R_INTERNAL_ERROR);
return -1;
}
s->type=SSL_ST_ACCEPT;
return -1;
}
s->type=SSL_ST_ACCEPT;
@@
-569,7
+569,7
@@
int dtls1_accept(SSL *s)
/* break; */
default:
/* break; */
default:
- SSLerr(SSL_F_
SSL3
_ACCEPT,SSL_R_UNKNOWN_STATE);
+ SSLerr(SSL_F_
DTLS1
_ACCEPT,SSL_R_UNKNOWN_STATE);
ret= -1;
goto end;
/* break; */
ret= -1;
goto end;
/* break; */
@@
-707,7
+707,7
@@
int dtls1_send_server_hello(SSL *s)
sl=s->session->session_id_length;
if (sl > sizeof s->session->session_id)
{
sl=s->session->session_id_length;
if (sl > sizeof s->session->session_id)
{
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
return -1;
}
*(p++)=sl;
return -1;
}
*(p++)=sl;
@@
-812,7
+812,7
@@
int dtls1_send_server_key_exchange(SSL *s)
if(rsa == NULL)
{
al=SSL_AD_HANDSHAKE_FAILURE;
if(rsa == NULL)
{
al=SSL_AD_HANDSHAKE_FAILURE;
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,SSL_R_ERROR_GENERATING_TMP_RSA_KEY);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,SSL_R_ERROR_GENERATING_TMP_RSA_KEY);
goto f_err;
}
RSA_up_ref(rsa);
goto f_err;
}
RSA_up_ref(rsa);
@@
-821,7
+821,7
@@
int dtls1_send_server_key_exchange(SSL *s)
if (rsa == NULL)
{
al=SSL_AD_HANDSHAKE_FAILURE;
if (rsa == NULL)
{
al=SSL_AD_HANDSHAKE_FAILURE;
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_KEY);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_RSA_KEY);
goto f_err;
}
r[0]=rsa->n;
goto f_err;
}
r[0]=rsa->n;
@@
-841,20
+841,20
@@
int dtls1_send_server_key_exchange(SSL *s)
if (dhp == NULL)
{
al=SSL_AD_HANDSHAKE_FAILURE;
if (dhp == NULL)
{
al=SSL_AD_HANDSHAKE_FAILURE;
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,SSL_R_MISSING_TMP_DH_KEY);
goto f_err;
}
if (s->s3->tmp.dh != NULL)
{
DH_free(dh);
goto f_err;
}
if (s->s3->tmp.dh != NULL)
{
DH_free(dh);
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR);
goto err;
}
if ((dh=DHparams_dup(dhp)) == NULL)
{
goto err;
}
if ((dh=DHparams_dup(dhp)) == NULL)
{
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
goto err;
}
goto err;
}
@@
-865,7
+865,7
@@
int dtls1_send_server_key_exchange(SSL *s)
{
if(!DH_generate_key(dh))
{
{
if(!DH_generate_key(dh))
{
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,
ERR_R_DH_LIB);
goto err;
}
ERR_R_DH_LIB);
goto err;
}
@@
-877,7
+877,7
@@
int dtls1_send_server_key_exchange(SSL *s)
if ((dh->pub_key == NULL) ||
(dh->priv_key == NULL))
{
if ((dh->pub_key == NULL) ||
(dh->priv_key == NULL))
{
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,ERR_R_DH_LIB);
goto err;
}
}
goto err;
}
}
@@
-889,7
+889,7
@@
int dtls1_send_server_key_exchange(SSL *s)
#endif
{
al=SSL_AD_HANDSHAKE_FAILURE;
#endif
{
al=SSL_AD_HANDSHAKE_FAILURE;
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_KEY_EXCHANGE_TYPE);
goto f_err;
}
for (i=0; r[i] != NULL; i++)
goto f_err;
}
for (i=0; r[i] != NULL; i++)
@@
-916,7
+916,7
@@
int dtls1_send_server_key_exchange(SSL *s)
if (!BUF_MEM_grow_clean(buf,n+DTLS1_HM_HEADER_LENGTH+kn))
{
if (!BUF_MEM_grow_clean(buf,n+DTLS1_HM_HEADER_LENGTH+kn))
{
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_BUF);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_BUF);
goto err;
}
d=(unsigned char *)s->init_buf->data;
goto err;
}
d=(unsigned char *)s->init_buf->data;
@@
-955,7
+955,7
@@
int dtls1_send_server_key_exchange(SSL *s)
if (RSA_sign(NID_md5_sha1, md_buf, j,
&(p[2]), &u, pkey->pkey.rsa) <= 0)
{
if (RSA_sign(NID_md5_sha1, md_buf, j,
&(p[2]), &u, pkey->pkey.rsa) <= 0)
{
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_RSA);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_RSA);
goto err;
}
s2n(u,p);
goto err;
}
s2n(u,p);
@@
-974,7
+974,7
@@
int dtls1_send_server_key_exchange(SSL *s)
if (!EVP_SignFinal(&md_ctx,&(p[2]),
(unsigned int *)&i,pkey))
{
if (!EVP_SignFinal(&md_ctx,&(p[2]),
(unsigned int *)&i,pkey))
{
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_DSA);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,ERR_LIB_DSA);
goto err;
}
s2n(i,p);
goto err;
}
s2n(i,p);
@@
-985,7
+985,7
@@
int dtls1_send_server_key_exchange(SSL *s)
{
/* Is this error check actually needed? */
al=SSL_AD_HANDSHAKE_FAILURE;
{
/* Is this error check actually needed? */
al=SSL_AD_HANDSHAKE_FAILURE;
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_PKEY_TYPE);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_KEY_EXCHANGE,SSL_R_UNKNOWN_PKEY_TYPE);
goto f_err;
}
}
goto f_err;
}
}
@@
-1047,7
+1047,7
@@
int dtls1_send_certificate_request(SSL *s)
j=i2d_X509_NAME(name,NULL);
if (!BUF_MEM_grow_clean(buf,DTLS1_HM_HEADER_LENGTH+n+j+2))
{
j=i2d_X509_NAME(name,NULL);
if (!BUF_MEM_grow_clean(buf,DTLS1_HM_HEADER_LENGTH+n+j+2))
{
- SSLerr(SSL_F_
SSL3
_SEND_CERTIFICATE_REQUEST,ERR_R_BUF_LIB);
+ SSLerr(SSL_F_
DTLS1
_SEND_CERTIFICATE_REQUEST,ERR_R_BUF_LIB);
goto err;
}
p=(unsigned char *)&(buf->data[DTLS1_HM_HEADER_LENGTH+n]);
goto err;
}
p=(unsigned char *)&(buf->data[DTLS1_HM_HEADER_LENGTH+n]);
@@
-1075,7
+1075,7
@@
int dtls1_send_certificate_request(SSL *s)
d=(unsigned char *)buf->data;
*(d++)=SSL3_MT_CERTIFICATE_REQUEST;
l2n3(n,d);
d=(unsigned char *)buf->data;
*(d++)=SSL3_MT_CERTIFICATE_REQUEST;
l2n3(n,d);
-
l
2n(s->d1->handshake_write_seq,d);
+
s
2n(s->d1->handshake_write_seq,d);
s->d1->handshake_write_seq++;
/* we should now have things packed up, so lets send
s->d1->handshake_write_seq++;
/* we should now have things packed up, so lets send
@@
-1122,7
+1122,7
@@
int dtls1_send_server_certificate(SSL *s)
& (SSL_MKEY_MASK|SSL_AUTH_MASK))
!= (SSL_aKRB5|SSL_kKRB5))
{
& (SSL_MKEY_MASK|SSL_AUTH_MASK))
!= (SSL_aKRB5|SSL_kKRB5))
{
- SSLerr(SSL_F_
SSL3
_SEND_SERVER_CERTIFICATE,ERR_R_INTERNAL_ERROR);
+ SSLerr(SSL_F_
DTLS1
_SEND_SERVER_CERTIFICATE,ERR_R_INTERNAL_ERROR);
return(0);
}
return(0);
}