abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-06-13 08:23:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

add CBC-MAC and GM OTP, not tested

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
ssl/ssl_lib.c
View File

@@ -263,6 +263,7 @@ int SSL_clear(SSL *s)
}
/** Used to change an SSL_CTXs default SSL method type */
//TODO: GMSSL
int SSL_CTX_set_ssl_version(SSL_CTX *ctx, const SSL_METHOD *meth)
{
STACK_OF(SSL_CIPHER) *sk;
@@ -874,6 +875,7 @@ int SSL_pending(const SSL *s)
return (s->method->ssl_pending(s));
}
//FIXME: GMSSL: do we need more API for GMSSLv1.1?
X509 *SSL_get_peer_certificate(const SSL *s)
{
X509 *r;
@@ -891,6 +893,7 @@ X509 *SSL_get_peer_certificate(const SSL *s)
return (r);
}
//FIXME: GMSSL: do we need more API for GMSSLv1.1?
STACK_OF(X509) *SSL_get_peer_cert_chain(const SSL *s)
{
STACK_OF(X509) *r;
@@ -941,6 +944,7 @@ void SSL_copy_session_id(SSL *t, const SSL *f)
}
/* Fix this so it checks all the valid key/cert options */
//FIXME: GMSSL: do we need more API for GMSSLv1.1?
int SSL_CTX_check_private_key(const SSL_CTX *ctx)
{
if ((ctx == NULL) ||
@@ -959,6 +963,7 @@ int SSL_CTX_check_private_key(const SSL_CTX *ctx)
}
/* Fix this function so that it takes an optional type parameter */
//FIXME: GMSSL: do we need more API for GMSSLv1.1?
int SSL_check_private_key(const SSL *ssl)
{
if (ssl == NULL) {
@@ -1095,6 +1100,7 @@ int SSL_renegotiate_pending(SSL *s)
return (s->renegotiate != 0);
}
//FIXME: GMSSL: add GMSSLv1.1 specific functions here?
long SSL_ctrl(SSL *s, int cmd, long larg, void *parg)
{
long l;
@@ -1173,6 +1179,8 @@ LHASH_OF(SSL_SESSION) *SSL_CTX_sessions(SSL_CTX *ctx)
return ctx->sessions;
}
//FIXME: GMSSL: add GMSSLv1.1 specific functions here?
//The double cert should be added here, we might add the extra cert
long SSL_CTX_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
{
long l;
@@ -2842,6 +2850,10 @@ const char *SSL_get_version(const SSL *s)
return ("DTLSv1");
else if (s->version == DTLS1_2_VERSION)
return ("DTLSv1.2");
#ifndef OPENSSL_NO_GMSSL
else if (s->version == GM1_VERSION)
return ("GMSSLv1.1");
#endif
else
return ("unknown");
}