add CBC-MAC and GM OTP, not tested

This commit is contained in:
Zhi Guan
2016-05-15 20:21:51 +02:00
parent 8c0439e7d6
commit 60d14da0cc
81 changed files with 2789 additions and 1401 deletions

View File

@@ -1699,10 +1699,9 @@ struct ssl_st {
# include <openssl/dtls1.h> /* Datagram TLS */
# include <openssl/ssl23.h>
# include <openssl/srtp.h> /* Support for the use_srtp extension */
#ifndef OPENSSL_NO_GMSSL
#include <openssl/gmssl.h>
#endif
# ifndef OPENSSL_NO_GMSSL
# include <openssl/gmssl1.h>
# endif
#ifdef __cplusplus
@@ -2393,6 +2392,12 @@ const SSL_METHOD *DTLS_method(void); /* DTLS 1.0 and 1.2 */
const SSL_METHOD *DTLS_server_method(void); /* DTLS 1.0 and 1.2 */
const SSL_METHOD *DTLS_client_method(void); /* DTLS 1.0 and 1.2 */
#ifndef OPENSSL_NO_GMSSL
const SSL_METHOD *GMSSLv1_method(void);
const SSL_METHOD *GMSSLv1_server_method(void);
const SSL_METHOD *GMSSLv1_client_method(void);
#endif
STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
int SSL_do_handshake(SSL *s);