Only in openssh-7.8p1_mod/openbsd-compat: Makefile diff -U 10 -r openssh-7.8p1/ssh-pkcs11.c openssh-7.8p1_mod/ssh-pkcs11.c --- openssh-7.8p1/ssh-pkcs11.c 2018-08-23 14:41:42.000000000 +0900 +++ openssh-7.8p1_mod/ssh-pkcs11.c 2018-08-25 23:34:09.884118954 +0900 @@ -25,20 +25,29 @@ #endif #include #include #include #include #include "openbsd-compat/sys-queue.h" #include +#include +#ifdef OPENSSL_HAS_ECC +#include +#if ((defined(LIBRESSL_VERSION_NUMBER) && \ + (LIBRESSL_VERSION_NUMBER >= 0x20010002L))) || \ + (defined(ECDSA_F_ECDSA_METHOD_NEW)) +#define ENABLE_PKCS11_ECDSA 1 +#endif +#endif #define CRYPTOKI_COMPAT #include "pkcs11.h" #include "log.h" #include "misc.h" #include "sshkey.h" #include "ssh-pkcs11.h" #include "xmalloc.h" @@ -59,27 +68,31 @@ int valid; int refcount; TAILQ_ENTRY(pkcs11_provider) next; }; TAILQ_HEAD(, pkcs11_provider) pkcs11_providers; struct pkcs11_key { struct pkcs11_provider *provider; CK_ULONG slotidx; + CK_ULONG key_type; int (*orig_finish)(RSA *rsa); RSA_METHOD rsa_method; char *keyid; int keyid_len; }; int pkcs11_interactive = 0; +#ifdef ENABLE_PKCS11_ECDSA +static int pkcs11_key_idx = -1; +#endif /* ENABLE_PKCS11_ECDSA */ int pkcs11_init(int interactive) { pkcs11_interactive = interactive; TAILQ_INIT(&pkcs11_providers); return (0); } /* @@ -209,20 +222,54 @@ nfound != 1) { debug("C_FindObjects failed (nfound %lu nattr %lu): %lu", nfound, nattr, rv); } else ret = 0; if ((rv = f->C_FindObjectsFinal(session)) != CKR_OK) error("C_FindObjectsFinal failed: %lu", rv); return (ret); } +int pkcs11_login(struct pkcs11_key *k11, CK_FUNCTION_LIST *f, struct pkcs11_slotinfo *si) { + char *pin = NULL, prompt[1024]; + CK_RV rv; + if ((si->token.flags & CKF_LOGIN_REQUIRED) && !si->logged_in) { + if (!pkcs11_interactive) { + error("need pin entry%s", (si->token.flags & + CKF_PROTECTED_AUTHENTICATION_PATH) ? + " on reader keypad" : ""); + return (-1); + } + if (si->token.flags & CKF_PROTECTED_AUTHENTICATION_PATH) + verbose("Deferring PIN entry to reader keypad."); + else { + snprintf(prompt, sizeof(prompt), + "Enter PIN for '%s': ", si->token.label); + pin = read_passphrase(prompt, RP_ALLOW_EOF); + if (pin == NULL) + return (-1); /* bail out */ + } + rv = f->C_Login(si->session, CKU_USER, (u_char *)pin, + (pin != NULL) ? strlen(pin) : 0); + if (pin != NULL) { + explicit_bzero(pin, strlen(pin)); + free(pin); + } + if (rv != CKR_OK && rv != CKR_USER_ALREADY_LOGGED_IN) { + error("C_Login failed: %lu", rv); + return (-1); + } + si->logged_in = 1; + } + return 0; +} + /* openssl callback doing the actual signing operation */ static int pkcs11_rsa_private_encrypt(int flen, const u_char *from, u_char *to, RSA *rsa, int padding) { struct pkcs11_key *k11; struct pkcs11_slotinfo *si; CK_FUNCTION_LIST *f; CK_OBJECT_HANDLE obj; CK_ULONG tlen = 0; @@ -230,63 +277,37 @@ CK_OBJECT_CLASS private_key_class = CKO_PRIVATE_KEY; CK_BBOOL true_val = CK_TRUE; CK_MECHANISM mech = { CKM_RSA_PKCS, NULL_PTR, 0 }; CK_ATTRIBUTE key_filter[] = { {CKA_CLASS, NULL, sizeof(private_key_class) }, {CKA_ID, NULL, 0}, {CKA_SIGN, NULL, sizeof(true_val) } }; - char *pin = NULL, prompt[1024]; int rval = -1; key_filter[0].pValue = &private_key_class; key_filter[2].pValue = &true_val; if ((k11 = RSA_get_app_data(rsa)) == NULL) { error("RSA_get_app_data failed for rsa %p", rsa); return (-1); } if (!k11->provider || !k11->provider->valid) { error("no pkcs11 (valid) provider for rsa %p", rsa); return (-1); } f = k11->provider->function_list; si = &k11->provider->slotinfo[k11->slotidx]; - if ((si->token.flags & CKF_LOGIN_REQUIRED) && !si->logged_in) { - if (!pkcs11_interactive) { - error("need pin entry%s", (si->token.flags & - CKF_PROTECTED_AUTHENTICATION_PATH) ? - " on reader keypad" : ""); - return (-1); - } - if (si->token.flags & CKF_PROTECTED_AUTHENTICATION_PATH) - verbose("Deferring PIN entry to reader keypad."); - else { - snprintf(prompt, sizeof(prompt), - "Enter PIN for '%s': ", si->token.label); - pin = read_passphrase(prompt, RP_ALLOW_EOF); - if (pin == NULL) - return (-1); /* bail out */ - } - rv = f->C_Login(si->session, CKU_USER, (u_char *)pin, - (pin != NULL) ? strlen(pin) : 0); - if (pin != NULL) { - explicit_bzero(pin, strlen(pin)); - free(pin); - } - if (rv != CKR_OK && rv != CKR_USER_ALREADY_LOGGED_IN) { - error("C_Login failed: %lu", rv); - return (-1); - } - si->logged_in = 1; + if(pkcs11_login(k11, f, si)) { + return (-1); } key_filter[1].pValue = k11->keyid; key_filter[1].ulValueLen = k11->keyid_len; /* try to find object w/CKA_SIGN first, retry w/o */ if (pkcs11_find(k11->provider, k11->slotidx, key_filter, 3, &obj) < 0 && pkcs11_find(k11->provider, k11->slotidx, key_filter, 2, &obj) < 0) { error("cannot find private key"); } else if ((rv = f->C_SignInit(si->session, &mech, obj)) != CKR_OK) { error("C_SignInit failed: %lu", rv); } else { @@ -310,40 +331,181 @@ /* redirect private key operations for rsa key to pkcs11 token */ static int pkcs11_rsa_wrap(struct pkcs11_provider *provider, CK_ULONG slotidx, CK_ATTRIBUTE *keyid_attrib, RSA *rsa) { struct pkcs11_key *k11; const RSA_METHOD *def = RSA_get_default_method(); k11 = xcalloc(1, sizeof(*k11)); + k11->key_type = CKK_RSA; k11->provider = provider; provider->refcount++; /* provider referenced by RSA key */ k11->slotidx = slotidx; /* identify key object on smartcard */ k11->keyid_len = keyid_attrib->ulValueLen; if (k11->keyid_len > 0) { k11->keyid = xmalloc(k11->keyid_len); memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len); } k11->orig_finish = def->finish; memcpy(&k11->rsa_method, def, sizeof(k11->rsa_method)); k11->rsa_method.name = "pkcs11"; k11->rsa_method.rsa_priv_enc = pkcs11_rsa_private_encrypt; k11->rsa_method.rsa_priv_dec = pkcs11_rsa_private_decrypt; k11->rsa_method.finish = pkcs11_rsa_finish; RSA_set_method(rsa, &k11->rsa_method); RSA_set_app_data(rsa, k11); return (0); } +#ifdef ENABLE_PKCS11_ECDSA +static ECDSA_SIG *pkcs11_ecdsa_sign(const unsigned char *dgst, int dgst_len, + const BIGNUM *inv, const BIGNUM *rp, + EC_KEY *ecdsa) { + struct pkcs11_key *k11; + struct pkcs11_slotinfo *si; + CK_FUNCTION_LIST *f; + CK_OBJECT_HANDLE obj; + CK_ULONG tlen = 0; + CK_RV rv; + CK_OBJECT_CLASS private_key_class = CKO_PRIVATE_KEY; + CK_BBOOL true_val = CK_TRUE; + CK_MECHANISM mech = { + CKM_ECDSA, NULL_PTR, 0 + }; + CK_ATTRIBUTE key_filter[] = { + {CKA_CLASS, NULL, sizeof(private_key_class) }, + {CKA_ID, NULL, 0}, + {CKA_SIGN, NULL, sizeof(true_val) } + }; + ECDSA_SIG *rval = NULL; + key_filter[0].pValue = &private_key_class; + key_filter[2].pValue = &true_val; + + if ((k11 = (struct pkcs11_key *)ECDSA_get_ex_data(ecdsa, pkcs11_key_idx)) == NULL) { + error("ECDSA_get_ex_data failed for ecdsa %p", ecdsa); + return NULL; + } + if (!k11->provider || !k11->provider->valid) { + error("no pkcs11 (valid) provider for ecdsa %p", ecdsa); + return NULL; + } + f = k11->provider->function_list; + si = &k11->provider->slotinfo[k11->slotidx]; + if(pkcs11_login(k11, f, si)) { + return NULL; + } + key_filter[1].pValue = k11->keyid; + key_filter[1].ulValueLen = k11->keyid_len; + /* try to find object w/CKA_SIGN first, retry w/o */ + if (pkcs11_find(k11->provider, k11->slotidx, key_filter, 3, &obj) < 0 && + pkcs11_find(k11->provider, k11->slotidx, key_filter, 2, &obj) < 0) { + error("cannot find private key"); + } else if ((rv = f->C_SignInit(si->session, &mech, obj)) != CKR_OK) { + error("C_SignInit failed: %lu", rv); + } else { + CK_BYTE_PTR buf = NULL; + int nlen; + /* Make a call to C_Sign to find out the size of the signature */ + rv = f->C_Sign(si->session, (CK_BYTE *)dgst, dgst_len, NULL, &tlen); + if (rv != CKR_OK) { + error("C_Sign failed: %lu", rv); + return NULL; + } + if ((buf = xmalloc(tlen)) == NULL) { + error("failure to allocate signature buffer"); + return NULL; + } + rv = f->C_Sign(si->session, (CK_BYTE *)dgst, dgst_len, buf, &tlen); + if (rv != CKR_OK) { + error("C_Sign failed: %lu", rv); + } + + if ((rval = ECDSA_SIG_new()) == NULL) { + error("failure to allocate ECDSA signature"); + } else { + /* + * ECDSA signature is 2 large integers of same size returned + * concatenated by PKCS#11, we separate them to create an + * ECDSA_SIG for OpenSSL. + */ + nlen = tlen / 2; + BN_bin2bn(&buf[0], nlen, rval->r); + BN_bin2bn(&buf[nlen], nlen, rval->s); + } + free(buf); + } + return (rval); +} + +static ECDSA_METHOD *get_pkcs11_ecdsa_method(void) { + static ECDSA_METHOD *pkcs11_ecdsa_method = NULL; + if(pkcs11_key_idx == -1) { + pkcs11_key_idx = ECDSA_get_ex_new_index(0, NULL, NULL, NULL, 0); + } + if(pkcs11_ecdsa_method == NULL) { + const ECDSA_METHOD *def = ECDSA_get_default_method(); +#ifdef ECDSA_F_ECDSA_METHOD_NEW + pkcs11_ecdsa_method = ECDSA_METHOD_new((ECDSA_METHOD *)def); + ECDSA_METHOD_set_name(pkcs11_ecdsa_method, "pkcs11"); + ECDSA_METHOD_set_sign(pkcs11_ecdsa_method, pkcs11_ecdsa_sign); +#else + pkcs11_ecdsa_method = xcalloc(1, sizeof(*pkcs11_ecdsa_method)); + memcpy(pkcs11_ecdsa_method, def, sizeof(*pkcs11_ecdsa_method)); + pkcs11_ecdsa_method->name = "pkcs11"; + pkcs11_ecdsa_method->ecdsa_do_sign = pkcs11_ecdsa_sign; +#endif + } + return pkcs11_ecdsa_method; +} + +static int +pkcs11_ecdsa_wrap(struct pkcs11_provider *provider, CK_ULONG slotidx, + CK_ATTRIBUTE *keyid_attrib, EC_KEY *ecdsa) +{ + struct pkcs11_key *k11; + k11 = xcalloc(1, sizeof(*k11)); + k11->key_type = CKK_EC; + k11->provider = provider; + provider->refcount++; /* provider referenced by ECDSA key */ + k11->slotidx = slotidx; + /* identify key object on smartcard */ + k11->keyid_len = keyid_attrib->ulValueLen; + k11->keyid = xmalloc(k11->keyid_len); + memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len); + ECDSA_set_method(ecdsa, get_pkcs11_ecdsa_method()); + ECDSA_set_ex_data(ecdsa, pkcs11_key_idx, k11); + return (0); +} +#endif /* ENABLE_PKCS11_ECDSA */ + +int pkcs11_del_key(struct sshkey *key) { +#ifdef ENABLE_PKCS11_ECDSA + if(key->type == KEY_ECDSA) { + struct pkcs11_key *k11 = (struct pkcs11_key *) + ECDSA_get_ex_data(key->ecdsa, pkcs11_key_idx); + if (k11 == NULL) { + error("ECDSA_get_ex_data failed for ecdsa %p", key->ecdsa); + } else { + if (k11->provider) + pkcs11_provider_unref(k11->provider); + free(k11->keyid); + free(k11); + } + } +#endif /* ENABLE_PKCS11_ECDSA */ + sshkey_free(key); + return (0); +} + /* remove trailing spaces */ static void rmspace(u_char *buf, size_t len) { size_t i; if (!len) return; for (i = len - 1; i > 0; i--) if (i == len - 1 || buf[i] == ' ') @@ -410,30 +572,41 @@ { CKA_CLASS, NULL, sizeof(pubkey_class) } }; CK_ATTRIBUTE cert_filter[] = { { CKA_CLASS, NULL, sizeof(cert_class) } }; CK_ATTRIBUTE pubkey_attribs[] = { { CKA_ID, NULL, 0 }, { CKA_MODULUS, NULL, 0 }, { CKA_PUBLIC_EXPONENT, NULL, 0 } }; +#ifdef ENABLE_PKCS11_ECDSA + CK_ATTRIBUTE ecdsa_attribs[] = { + { CKA_ID, NULL, 0 }, + { CKA_EC_PARAMS, NULL, 0 }, + { CKA_EC_POINT, NULL, 0 } + }; +#endif /* ENABLE_PKCS11_ECDSA */ CK_ATTRIBUTE cert_attribs[] = { { CKA_ID, NULL, 0 }, { CKA_SUBJECT, NULL, 0 }, { CKA_VALUE, NULL, 0 } }; pubkey_filter[0].pValue = &pubkey_class; cert_filter[0].pValue = &cert_class; if (pkcs11_fetch_keys_filter(p, slotidx, pubkey_filter, pubkey_attribs, keysp, nkeys) < 0 || +#ifdef ENABLE_PKCS11_ECDSA + pkcs11_fetch_keys_filter(p, slotidx, pubkey_filter, ecdsa_attribs, + keysp, nkeys) < 0|| +#endif /* ENABLE_PKCS11_ECDSA */ pkcs11_fetch_keys_filter(p, slotidx, cert_filter, cert_attribs, keysp, nkeys) < 0) return (-1); return (0); } static int pkcs11_key_included(struct sshkey ***keysp, int *nkeys, struct sshkey *key) { int i; @@ -444,20 +617,25 @@ return (0); } static int pkcs11_fetch_keys_filter(struct pkcs11_provider *p, CK_ULONG slotidx, CK_ATTRIBUTE filter[], CK_ATTRIBUTE attribs[3], struct sshkey ***keysp, int *nkeys) { struct sshkey *key; RSA *rsa; +#ifdef ENABLE_PKCS11_ECDSA + EC_KEY *ecdsa; +#else + void *ecdsa; +#endif /* ENABLE_PKCS11_ECDSA */ X509 *x509; EVP_PKEY *evp; int i; const u_char *cp; CK_RV rv; CK_OBJECT_HANDLE obj; CK_ULONG nfound; CK_SESSION_HANDLE session; CK_FUNCTION_LIST *f; @@ -498,68 +676,127 @@ attribs[i].pValue = xmalloc( attribs[i].ulValueLen); } } /* * retrieve ID, modulus and public exponent of RSA key, * or ID, subject and value for certificates. */ rsa = NULL; +#ifdef ENABLE_PKCS11_ECDSA + ecdsa = NULL; +#endif /* ENABLE_PKCS11_ECDSA */ if ((rv = f->C_GetAttributeValue(session, obj, attribs, 3)) != CKR_OK) { error("C_GetAttributeValue failed: %lu", rv); } else if (attribs[1].type == CKA_MODULUS ) { if ((rsa = RSA_new()) == NULL) { error("RSA_new failed"); } else { rsa->n = BN_bin2bn(attribs[1].pValue, attribs[1].ulValueLen, NULL); rsa->e = BN_bin2bn(attribs[2].pValue, attribs[2].ulValueLen, NULL); } +#ifdef ENABLE_PKCS11_ECDSA + } else if (attribs[1].type == CKA_EC_PARAMS ) { + if ((ecdsa = EC_KEY_new()) == NULL) { + error("EC_KEY_new failed"); + } else { + const unsigned char *ptr1 = attribs[1].pValue; + const unsigned char *ptr2 = attribs[2].pValue; + CK_ULONG len1 = attribs[1].ulValueLen; + CK_ULONG len2 = attribs[2].ulValueLen; + ASN1_OCTET_STRING *point = NULL; + + /* + * CKA_EC_PARAMS contains the curve parameters of the key + * either referenced as an OID or directly with all values. + * CKA_EC_POINT contains the point (public key) on the curve. + * The point is should be returned inside a DER-encoded + * ASN.1 OCTET STRING value (but some implementation). + */ + if ((point = d2i_ASN1_OCTET_STRING(NULL, &ptr2, len2))) { + /* Pointing to OCTET STRING content */ + ptr2 = point->data; + len2 = point->length; + } else { + /* No OCTET STRING */ + ptr2 = attribs[2].pValue; + } + + if((d2i_ECParameters(&ecdsa, &ptr1, len1) == NULL) || + (o2i_ECPublicKey(&ecdsa, &ptr2, len2) == NULL)) { + EC_KEY_free(ecdsa); + ecdsa = NULL; + error("EC public key parsing failed"); + } + + if(point) { + M_ASN1_OCTET_STRING_free(point); + } + } +#endif /* ENABLE_PKCS11_ECDSA */ } else { cp = attribs[2].pValue; if ((x509 = X509_new()) == NULL) { error("X509_new failed"); } else if (d2i_X509(&x509, &cp, attribs[2].ulValueLen) == NULL) { error("d2i_X509 failed"); } else if ((evp = X509_get_pubkey(x509)) == NULL || evp->type != EVP_PKEY_RSA || evp->pkey.rsa == NULL) { debug("X509_get_pubkey failed or no rsa"); } else if ((rsa = RSAPublicKey_dup(evp->pkey.rsa)) == NULL) { error("RSAPublicKey_dup"); } X509_free(x509); } - if (rsa && rsa->n && rsa->e && - pkcs11_rsa_wrap(p, slotidx, &attribs[0], rsa) == 0) { - if ((key = sshkey_new(KEY_UNSPEC)) == NULL) - fatal("sshkey_new failed"); - key->rsa = rsa; - key->type = KEY_RSA; - key->flags |= SSHKEY_FLAG_EXT; + key = NULL; + if (rsa || ecdsa) { + if (rsa && rsa->n && rsa->e && + pkcs11_rsa_wrap(p, slotidx, &attribs[0], rsa) == 0) { + key = sshkey_new(KEY_UNSPEC); + key->rsa = rsa; + key->type = KEY_RSA; + key->flags |= SSHKEY_FLAG_EXT; +#ifdef ENABLE_PKCS11_ECDSA + } else if(ecdsa && pkcs11_ecdsa_wrap(p, slotidx, &attribs[0], ecdsa) == 0) { + key = sshkey_new(KEY_UNSPEC); + key->ecdsa = ecdsa; + key->ecdsa_nid = sshkey_ecdsa_key_to_nid(ecdsa); + key->type = KEY_ECDSA; + key->flags |= SSHKEY_FLAG_EXT; +#endif /* ENABLE_PKCS11_ECDSA */ + } + } + + if(key) { if (pkcs11_key_included(keysp, nkeys, key)) { sshkey_free(key); } else { /* expand key array and add key */ *keysp = xrecallocarray(*keysp, *nkeys, *nkeys + 1, sizeof(struct sshkey *)); (*keysp)[*nkeys] = key; *nkeys = *nkeys + 1; debug("have %d keys", *nkeys); } } else if (rsa) { RSA_free(rsa); +#ifdef ENABLE_PKCS11_ECDSA + } else if (ecdsa) { + EC_KEY_free(ecdsa); +#endif /* ENABLE_PKCS11_ECDSA */ } for (i = 0; i < 3; i++) free(attribs[i].pValue); } if ((rv = f->C_FindObjectsFinal(session)) != CKR_OK) error("C_FindObjectsFinal failed: %lu", rv); return (0); } /* register a new provider, fails if provider already exists */ diff -U 10 -r openssh-7.8p1/ssh-pkcs11-client.c openssh-7.8p1_mod/ssh-pkcs11-client.c --- openssh-7.8p1/ssh-pkcs11-client.c 2018-08-23 14:41:42.000000000 +0900 +++ openssh-7.8p1_mod/ssh-pkcs11-client.c 2018-08-26 00:20:19.547019100 +0900 @@ -24,20 +24,28 @@ # include #endif #include #include #include #include #include #include +#ifdef OPENSSL_HAS_ECC +#include +#if ((defined(LIBRESSL_VERSION_NUMBER) && \ + (LIBRESSL_VERSION_NUMBER >= 0x20010002L))) || \ + (defined(ECDSA_F_ECDSA_METHOD_NEW)) +#define ENABLE_PKCS11_ECDSA 1 +#endif +#endif #include "pathnames.h" #include "xmalloc.h" #include "sshbuf.h" #include "log.h" #include "misc.h" #include "sshkey.h" #include "authfd.h" #include "atomicio.h" #include "ssh-pkcs11.h" @@ -145,33 +153,98 @@ if (slen <= (size_t)RSA_size(rsa)) { memcpy(to, signature, slen); ret = slen; } free(signature); } sshbuf_free(msg); return (ret); } -/* redirect the private key encrypt operation to the ssh-pkcs11-helper */ +/* redirect the RSA private key encrypt operation to the ssh-pkcs11-helper */ static int -wrap_key(RSA *rsa) +wrap_rsa_key(RSA *rsa) { static RSA_METHOD helper_rsa; memcpy(&helper_rsa, RSA_get_default_method(), sizeof(helper_rsa)); helper_rsa.name = "ssh-pkcs11-helper"; helper_rsa.rsa_priv_enc = pkcs11_rsa_private_encrypt; RSA_set_method(rsa, &helper_rsa); return (0); } +#ifdef ENABLE_PKCS11_ECDSA +static ECDSA_SIG * +pkcs11_ecdsa_private_sign(const unsigned char *from, int flen, + const BIGNUM *inv, const BIGNUM *r, EC_KEY * ecdsa) +{ + struct sshkey key; + u_char *blob, *signature = NULL; + size_t blen, slen = 0; + struct sshbuf *msg; + int re; + ECDSA_SIG *ret = NULL; + + key.type = KEY_ECDSA; + key.ecdsa = ecdsa; + key.ecdsa_nid = sshkey_ecdsa_key_to_nid(ecdsa); + if (sshkey_to_blob(&key, &blob, &blen) == 0) + return NULL; + if ((msg = sshbuf_new()) == NULL) + fatal("%s: sshbuf_new failed", __func__); + if ((re = sshbuf_put_u8(msg, SSH2_AGENTC_SIGN_REQUEST)) != 0 || + (re = sshbuf_put_string(msg, blob, blen)) != 0 || + (re = sshbuf_put_string(msg, from, flen)) != 0 || + (re = sshbuf_put_u32(msg, 0)) != 0) + fatal("%s: buffer error: %s", __func__, ssh_err(re)); + free(blob); + send_msg(msg); + sshbuf_reset(msg); + + if (recv_msg(msg) == SSH2_AGENT_SIGN_RESPONSE) { + if ((re = sshbuf_get_string(msg, &signature, &slen)) != 0) + fatal("%s: buffer error: %s", __func__, ssh_err(re)); + if (slen <= (size_t)ECDSA_size(ecdsa)) { + int nlen = slen / 2; + ret = ECDSA_SIG_new(); + BN_bin2bn(&signature[0], nlen, ret->r); + BN_bin2bn(&signature[nlen], nlen, ret->s); + } + free(signature); + } + sshbuf_free(msg); + return (ret); +} + +/* redirect the ECDSA private key encrypt operation to the ssh-pkcs11-helper */ +static int +wrap_ecdsa_key(EC_KEY *ecdsa) { + static ECDSA_METHOD *helper_ecdsa = NULL; + if(helper_ecdsa == NULL) { + const ECDSA_METHOD *def = ECDSA_get_default_method(); +#ifdef ECDSA_F_ECDSA_METHOD_NEW + helper_ecdsa = ECDSA_METHOD_new((ECDSA_METHOD *)def); + ECDSA_METHOD_set_name(helper_ecdsa, "ssh-pkcs11-helper-ecdsa"); + ECDSA_METHOD_set_sign(helper_ecdsa, pkcs11_ecdsa_private_sign); +#else + helper_ecdsa = xcalloc(1, sizeof(*helper_ecdsa)); + memcpy(helper_ecdsa, def, sizeof(*helper_ecdsa)); + helper_ecdsa->name = "ssh-pkcs11-helper-ecdsa"; + helper_ecdsa->ecdsa_do_sign = pkcs11_ecdsa_private_sign; +#endif + } + ECDSA_set_method(ecdsa, helper_ecdsa); + return (0); +} +#endif + static int pkcs11_start_helper(void) { int pair[2]; if (socketpair(AF_UNIX, SOCK_STREAM, 0, pair) == -1) { error("socketpair: %s", strerror(errno)); return (-1); } if ((pid = fork()) == -1) { @@ -223,21 +296,29 @@ fatal("%s: buffer error: %s", __func__, ssh_err(r)); *keysp = xcalloc(nkeys, sizeof(struct sshkey *)); for (i = 0; i < nkeys; i++) { /* XXX clean up properly instead of fatal() */ if ((r = sshbuf_get_string(msg, &blob, &blen)) != 0 || (r = sshbuf_skip_string(msg)) != 0) fatal("%s: buffer error: %s", __func__, ssh_err(r)); if ((r = sshkey_from_blob(blob, blen, &k)) != 0) fatal("%s: bad key: %s", __func__, ssh_err(r)); - wrap_key(k->rsa); + if(k->type == KEY_RSA) { + wrap_rsa_key(k->rsa); +#ifdef ENABLE_PKCS11_ECDSA + } else if(k->type == KEY_ECDSA) { + wrap_ecdsa_key(k->ecdsa); +#endif /* ENABLE_PKCS11_ECDSA */ + } else { + /* Unsupported type */ + } (*keysp)[i] = k; free(blob); } } else { nkeys = -1; } sshbuf_free(msg); return (nkeys); } diff -U 10 -r openssh-7.8p1/ssh-pkcs11.h openssh-7.8p1_mod/ssh-pkcs11.h --- openssh-7.8p1/ssh-pkcs11.h 2018-08-23 14:41:42.000000000 +0900 +++ openssh-7.8p1_mod/ssh-pkcs11.h 2018-08-25 23:34:09.884118954 +0900 @@ -10,15 +10,16 @@ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ int pkcs11_init(int); void pkcs11_terminate(void); int pkcs11_add_provider(char *, char *, struct sshkey ***); +int pkcs11_del_key(struct sshkey *); int pkcs11_del_provider(char *); #if !defined(WITH_OPENSSL) && defined(ENABLE_PKCS11) #undef ENABLE_PKCS11 #endif diff -U 10 -r openssh-7.8p1/ssh-pkcs11-helper.c openssh-7.8p1_mod/ssh-pkcs11-helper.c --- openssh-7.8p1/ssh-pkcs11-helper.c 2018-08-23 14:41:42.000000000 +0900 +++ openssh-7.8p1_mod/ssh-pkcs11-helper.c 2018-08-25 23:34:09.884118954 +0900 @@ -17,20 +17,30 @@ #include "includes.h" #include #ifdef HAVE_SYS_TIME_H # include #endif #include "openbsd-compat/sys-queue.h" +#include +#ifdef OPENSSL_HAS_ECC +#include +#if ((defined(LIBRESSL_VERSION_NUMBER) && \ + (LIBRESSL_VERSION_NUMBER >= 0x20010002L))) || \ + (defined(ECDSA_F_ECDSA_METHOD_NEW)) +#define ENABLE_PKCS11_ECDSA 1 +#endif +#endif + #include #include #include #include #include "xmalloc.h" #include "sshbuf.h" #include "log.h" #include "misc.h" #include "sshkey.h" @@ -70,21 +80,21 @@ static void del_keys_by_name(char *name) { struct pkcs11_keyinfo *ki, *nxt; for (ki = TAILQ_FIRST(&pkcs11_keylist); ki; ki = nxt) { nxt = TAILQ_NEXT(ki, next); if (!strcmp(ki->providername, name)) { TAILQ_REMOVE(&pkcs11_keylist, ki, next); free(ki->providername); - sshkey_free(ki->key); + pkcs11_del_key(ki->key); free(ki); } } } /* lookup matching 'private' key */ static struct sshkey * lookup_key(struct sshkey *k) { struct pkcs11_keyinfo *ki; @@ -185,28 +195,45 @@ if ((r = sshbuf_get_string(iqueue, &blob, &blen)) != 0 || (r = sshbuf_get_string(iqueue, &data, &dlen)) != 0 || (r = sshbuf_get_u32(iqueue, NULL)) != 0) fatal("%s: buffer error: %s", __func__, ssh_err(r)); if ((r = sshkey_from_blob(blob, blen, &key)) != 0) error("%s: sshkey_from_blob: %s", __func__, ssh_err(r)); else { if ((found = lookup_key(key)) != NULL) { #ifdef WITH_OPENSSL - int ret; - - slen = RSA_size(key->rsa); - signature = xmalloc(slen); - if ((ret = RSA_private_encrypt(dlen, data, signature, - found->rsa, RSA_PKCS1_PADDING)) != -1) { - slen = ret; - ok = 0; + if(found->type == KEY_RSA) { + int ret; + slen = RSA_size(key->rsa); + signature = xmalloc(slen); + if ((ret = RSA_private_encrypt(dlen, data, signature, + found->rsa, RSA_PKCS1_PADDING)) != -1) { + slen = ret; + ok = 0; + } +#ifdef ENABLE_PKCS11_ECDSA + } else if(found->type == KEY_ECDSA) { + ECDSA_SIG *sig = NULL; + if ((sig = ECDSA_do_sign(data, dlen, found->ecdsa)) != NULL) { + int rlen = BN_num_bytes(sig->r); + slen = BN_num_bytes(sig->s); + signature = xmalloc(slen + rlen); + BN_bn2bin(sig->r, signature); + BN_bn2bin(sig->s, signature + rlen); + ECDSA_SIG_free(sig); + slen += rlen; + ok = 0; + } +#endif /* ENABLE_PKCS11_ECDSA */ + } else { + /* Unsupported type */ } #endif /* WITH_OPENSSL */ } sshkey_free(key); } if ((msg = sshbuf_new()) == NULL) fatal("%s: sshbuf_new failed", __func__); if (ok == 0) { if ((r = sshbuf_put_u8(msg, SSH2_AGENT_SIGN_RESPONSE)) != 0 || (r = sshbuf_put_string(msg, signature, slen)) != 0)