j3d1/bearssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added support for client certificates (both client-side and server-side, but still missing an API for extracting the client identity from the certificate).

Browse source
This commit is contained in:
Thomas Pornin 2016-12-10 17:35:06 +01:00
parent e9ce2f4e8c
commit e61ad42191
27 changed files with 4441 additions and 1482 deletions
Download patch file Download diff file Expand all files Collapse all files

135
src/ssl/ssl_single_ec.c
View file

@ -1,135 +0,0 @@
/*
* Copyright (c) 2016 Thomas Pornin <pornin@bolet.org>
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#include "inner.h"
static int
se_choose(const br_ssl_server_policy_class **pctx,
const br_ssl_server_context *cc,
br_ssl_server_choices *choices)
{
br_ssl_server_policy_ec_context *pc;
const br_suite_translated *st;
size_t u, st_num;
int hash_id;
pc = (br_ssl_server_policy_ec_context *)pctx;
st = br_ssl_server_get_client_suites(cc, &st_num);
hash_id = br_ssl_choose_hash(br_ssl_server_get_client_hashes(cc));
if (cc->eng.session.version < BR_TLS12) {
hash_id = br_sha1_ID;
}
choices->chain = pc->chain;
choices->chain_len = pc->chain_len;
for (u = 0; u < st_num; u ++) {
unsigned tt;
tt = st[u][1];
switch (tt >> 12) {
case BR_SSLKEYX_ECDH_RSA:
if ((pc->allowed_usages & BR_KEYTYPE_KEYX) != 0
&& pc->cert_issuer_key_type == BR_KEYTYPE_RSA)
{
choices->cipher_suite = st[u][0];
return 1;
}
break;
case BR_SSLKEYX_ECDH_ECDSA:
if ((pc->allowed_usages & BR_KEYTYPE_KEYX) != 0
&& pc->cert_issuer_key_type == BR_KEYTYPE_EC)
{
choices->cipher_suite = st[u][0];
return 1;
}
break;
case BR_SSLKEYX_ECDHE_ECDSA:
if ((pc->allowed_usages & BR_KEYTYPE_SIGN) != 0
&& hash_id != 0)
{
choices->cipher_suite = st[u][0];
choices->hash_id = hash_id;
return 1;
}
break;
}
}
return 0;
}
static uint32_t
se_do_keyx(const br_ssl_server_policy_class **pctx,
unsigned char *data, size_t len)
{
br_ssl_server_policy_ec_context *pc;
pc = (br_ssl_server_policy_ec_context *)pctx;
return pc->iec->mul(data, len, pc->sk->x, pc->sk->xlen, pc->sk->curve);
}
static size_t
se_do_sign(const br_ssl_server_policy_class **pctx,
int hash_id, size_t hv_len, unsigned char *data, size_t len)
{
br_ssl_server_policy_ec_context *pc;
unsigned char hv[64];
const br_hash_class *hc;
pc = (br_ssl_server_policy_ec_context *)pctx;
hc = br_multihash_getimpl(pc->mhash, hash_id);
if (hc == NULL) {
return 0;
}
memcpy(hv, data, hv_len);
if (len < 139) {
return 0;
}
return pc->iecdsa(pc->iec, hc, hv, pc->sk, data);
}
static const br_ssl_server_policy_class se_policy_vtable = {
sizeof(br_ssl_server_policy_ec_context),
se_choose,
se_do_keyx,
se_do_sign
};
/* see bearssl_ssl.h */
void
br_ssl_server_set_single_ec(br_ssl_server_context *cc,
const br_x509_certificate *chain, size_t chain_len,
const br_ec_private_key *sk, unsigned allowed_usages,
unsigned cert_issuer_key_type,
const br_ec_impl *iec, br_ecdsa_sign iecdsa)
{
cc->chain_handler.single_ec.vtable = &se_policy_vtable;
cc->chain_handler.single_ec.chain = chain;
cc->chain_handler.single_ec.chain_len = chain_len;
cc->chain_handler.single_ec.sk = sk;
cc->chain_handler.single_ec.allowed_usages = allowed_usages;
cc->chain_handler.single_ec.cert_issuer_key_type = cert_issuer_key_type;
cc->chain_handler.single_ec.mhash = &cc->eng.mhash;
cc->chain_handler.single_ec.iec = iec;
cc->chain_handler.single_ec.iecdsa = iecdsa;
cc->policy_vtable = &cc->chain_handler.single_ec.vtable;
}