提交 7f354fa4 编写于 作者: D Dr. Stephen Henson

Ooops...

上级 6732e142
......@@ -1357,21 +1357,6 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p,
j = put_cb ? put_cb(c,p) : ssl_put_cipher_by_char(s,c,p);
p+=j;
}
#ifdef OPENSSL_RI_MAGIC
if (p == q)
return 0;
else
{
/* Bogus "cipher" to send out RI indicator */
static SSL_CIPHER ri =
{
0, NULL, OPENSSL_RI_MAGIC, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};
j = put_cb ? put_cb(&ri,p) : ssl_put_cipher_by_char(s,&ri,p);
p+=j;
}
#endif
return(p-q);
}
......
......@@ -287,13 +287,6 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
#endif
/* Renegotiation indicator "magic" ciphersuite from
* "draft-ietf-tls-renegotiation" (FIXME: put RFC# in here when ready)
* FIXME: put correct ciphersuite number in here when available.
*/
#define OPENSSL_RI_MAGIC 0x03000FEC
/* PSK ciphersuites from 4279 */
#define TLS1_CK_PSK_WITH_RC4_128_SHA 0x0300008A
#define TLS1_CK_PSK_WITH_3DES_EDE_CBC_SHA 0x0300008B
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册