X25519 improvements 2 in PKCS11-tool, PKCS15 routines and tools and openpgp #3090

dengert · 2024-03-27T14:24:01Z

Now that 0.25.0 has been released, this PR is being resubmitted and rebased on current master.
Fixes: #2952 which explains most of what was done.

It also addresses #3000 in that it can accept a CKA_EC_POINT as either in a ASN.1 BIT STRING or OCTET STRING but currently only return CKA_EC_POINT in ASN.1 OCTET STRING. It also add support for CKA_PUBLIC_KEY_INFO which is SPKI format.

It also add support for all four curves defined in RFC 8410 and and maps the uses of the experimental OIDs to these official OIDs in OpenSC, and in card-opensc.c that will still write the old OIDs to the cards as needed.

Individual commits have additional information.

Tested using using Yubikey NFC and Nitro Start tokens which only use the old OIDs and do not yet support the X448 keys.
-->

Checklist

Documentation is added or updated
New files have a LGPL 2.1 license statement
PKCS#11 module is tested
Windows minidriver is tested
macOS tokend is tested

src/libopensc/pkcs15-pubkey.c

src/libopensc/card-openpgp.h

src/libopensc/pkcs15-algo.c

src/libopensc/pkcs15-prkey.c

Jakuje · 2024-03-27T16:36:27Z

src/libopensc/pkcs15-pubkey.c

+	volatile int gdb_test = 0; /* so can reset via gdb for testing new  way */

 	LOG_FUNC_CALLED(ctx);
 	sc_copy_asn1_entry(c_asn1_ec_pointQ, asn1_ec_pointQ);
-	sc_format_asn1_entry(asn1_ec_pointQ + 0, key->ecpointQ.value, &key->ecpointQ.len, 1);
+
+	if (gdb_test == 1) {
+		key_len  = key->ecpointQ.len * 8; /* encode in bit string */
+		sc_format_asn1_entry(asn1_ec_pointQ + 0, key->ecpointQ.value, &key_len, 1);
+	} else {
+		key_len  = key->ecpointQ.len;
+		sc_format_asn1_entry(asn1_ec_pointQ + 1, key->ecpointQ.value, &key_len, 1);
+	}


before merging we will certainly need to remove the debugging variables like this.

This is the outstanding question of #3000 Did OpenSC return the CKA_EC_POINT in the wrong ASN.1?
It also looks like other packages followed our lead. This would not be easy to fix. The remedy is to use the CKA_PUBKEY_KEY_INFO as SPKI introduced in KCS11 2.40.

Other commits in this PR adds CKA_PUBKEY_KEY_INFO to OpenSC and will accept CKA_EC_POINT in either BIT STRING or OCTET STRING.

I would say that given that we believe the right format should be the bit string, we should output bit string and properly test it with other applications that might expect the other way round and fix them, ideally early in the release cycle. Having this in the code comment should be quite enough. Other option might be to provide some environment variable or configuration option for backward compatibility to satisfy unfixed applications.

Reading through this, I think having a configuration option to revert would be likely the best.

I am afraid that OpenSC was one of the first smartcard pkcs11 project to include ECDSA and got it wrong and other projects picked up on it.

You at RedHat have contacts with p11-kit and PKCS11 OASIS people. Can you ask them if we got to wrong, and what it would to convert? Or is the solution for every one to use CKA_PUBLIC_KEY_INFO that returns a SPKI format.

I had some discussion on the OASIS PKCS#11 mailing list to get the format clarified, but as far as I remember, they were not able to provide much more clarity (I do not follow the discussions there much now)

There was recently exactly this topic discussed here:

https://lists.oasis-open.org/archives/pkcs11/202310/msg00008.html

There seems to be some changes in the PKCS#11 3.1.

Let me know if there is something else to bring up there.

Jakuje · 2024-03-27T16:44:16Z

src/libopensc/pkcs15-pubkey.c

 		if (key->u.ec.params.der.value)
 			free(key->u.ec.params.der.value);
 		if (key->u.ec.params.named_curve)
 			free(key->u.ec.params.named_curve);
 		if (key->u.ec.ecpointQ.value)
 			free(key->u.ec.ecpointQ.value);


needless if(x) free(x). Please remove the needless if here, similarly as it was done in the eddsa case.

Just following the coding style in the routine which does the same for RSA, GOST and EC.

a7a524be1c (Doug Engert 2023-12-08 20:18:51 -0600 1169) case SC_ALGORITHM_EDDSA: a7a524be1c (Doug Engert 2023-12-08 20:18:51 -0600 1170) case SC_ALGORITHM_XEDDSA:

I can remove all the needless if if you want..

Yes please. This was common antipatern in the past and in a lot of places, probably making people feel safer, but there is not a single case when this would be useful for anything

src/libopensc/pkcs15-pubkey.c

src/tools/pkcs11-tool.c

Jakuje · 2024-03-27T16:51:59Z

src/tools/pkcs11-tool.c

 		{CKA_WRAP, &_true, sizeof(_true)},
 		{CKA_UNWRAP, &_true, sizeof(_true)}


I think ecdsa does can not do wrapping either so these should go away too.

Jakuje · 2024-03-27T16:53:21Z

src/tools/pkcs11-tool.c

+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+	key_id = EVP_PKEY_get_id(pkey);
+#else
+	key_id = EVP_PKEY_id(pkey);
+#endif


can we have this abstraction in compat-ossl header file?

Could be eliminated. OpenSC 1.1.1 and others define function EVP_PKEY_id

OpenSC 3.0, 3.1, 3.2 and 3.3 and above define function EVP_PKEY_get_id but have this define: #define EVP_PKEY_id EVP_PKEY_get_id

I will go ahead and use the EVP_PKEY_id

dengert · 2024-03-28T14:28:34Z

@Jakuje thanks for the review. I rebased with all the typos and minor changes as "fixup" and resolved those conversations. There are still a few that I left for further comments.

Jakuje · 2024-03-28T16:42:03Z

Thank you for the prompt reply and addressing the most important issues. I think this is a good start. But we need to catch the corner cases that now make the fuzzer fail, fix to todos ... but good to see all the other tests work for now.

dengert · 2024-03-28T17:55:26Z

@Jakuje @frankmorgner "The Check Code Style / build (pull_request)" yshui/git-clang-format-lint@master produced a 1052 line diff file for the 9 source files changed by this PR.

Many of the changes are to pre existing code, especially to "ec_curve" and other tables that have been formatted for easy reading and to code I did not change.

I would like to propose, that for these tables, we use // clang-fromat off and // clang-fromat on and I would like to submit a separate PR for these 9 files based on current master so any changes in this PR #3090 are then based on the new coding style.

Any ideas.

(Also have fix for the bug found by fuzzing.)

As suggested in comments in OpenSC#3090 simplify code when clearing a pubkey. Not shown in diff next line is: sc_mem_clear(key, sizeof(*key)); Date: Thu Mar 28 15:37:32 2024 -0500 On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

src/libopensc/pkcs15-pubkey.c

Jakuje · 2024-04-03T08:58:56Z

@Jakuje @frankmorgner "The Check Code Style / build (pull_request)" yshui/git-clang-format-lint@master produced a 1052 line diff file for the 9 source files changed by this PR.

With large PRs there will always be some reformatting and better to do it per small parts than all code base as it was in the clang format, which had much more files and much more LoC changes.

Many of the changes are to pre existing code, especially to "ec_curve" and other tables that have been formatted for easy reading and to code I did not change.

Yes, the formatter takes some contexts in to be able to format the new code.

I would like to propose, that for these tables, we use // clang-fromat off and // clang-fromat on and I would like to submit a separate PR for these 9 files based on current master so any changes in this PR #3090 are then based on the new coding style.

I am ok with keeping the tables in the clang-fromat off blocks as the clang does not handle well these large tables with our configuration. I am ok with separate reformatting PR, but keep in mind that some of the changes are just suggested (especially the long lines should be broken).

dengert · 2024-04-03T14:39:50Z

I am ok with keeping the tables in the clang-fromat off blocks as the clang does not handle well these large tables with our configuration. I am ok with separate reformatting PR, but keep in mind that some of the changes are just suggested (especially the long lines should be broken).

The part I did not like was it took multi-line if statements and made one long line.

Jakuje · 2024-04-04T10:07:32Z

The part I did not like was it took multi-line if statements and made one long line.

If you will split them manually (with correct breaking after operator and with correct indentation), it will not reformat them to long line anymore.

As suggested in comments in OpenSC#3090 simplify code when clearing a pubkey. Not shown in diff next line is: sc_mem_clear(key, sizeof(*key)); Date: Thu Mar 28 15:37:32 2024 -0500 On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

Jakuje

Code wise it looks good (few nits inline). But the openpgp test now fails, which does not look like a false positive. Can you check it?
Given this is a change in behavior, I would like to get this merged rather sooner than later so we have time to test it against other applications and tools before next release.

Jakuje · 2024-04-17T13:41:33Z

src/libopensc/pkcs15-pubkey.c

+			}
+			for (ii = 0; ec_curve_infos[ii].name; ii++) {
+				size_t len = strlen(ec_curve_infos[ii].name);
+				if (ecparams->der.len - 2 != len || memcmp(ec_curve_infos[ii].name, ecparams->der.value + 2, len) != 0)


this is printable string. Should we be strict about the case or use the strncasecmp to ignore the case?

But "printable string" was added for "PKCS11 V 3.0 for experimental curves" possibly without registered OIDs to avoid some made up unregistered OID slipping in to general use which is worse then passing in a printable string for testing experimental curves without an OID. In that case it is up to the developer to define the string and we should not second guest if it is case sensitive or not.

The whole problem with 25519 curves was that to use PKCS11 required the use of an OID, and the experimenters used OIDs registered but in private OID space, (better then made up OIDs) but not good to have standards based on private OIDs.

So I would suggest leaving memcmp.

src/libopensc/pkcs15-pubkey.c

src/tools/pkcs11-tool.c

frankmorgner

Implementation-wise I only have some minor comments.

Regarding the backward compatibility, I don't have a good overview if we really need that. My feeling is that there may only be some experiments where this has been tried out. So maybe we don't need to support the old (and bad) format anymore.

frankmorgner · 2024-04-17T22:13:25Z

src/libopensc/card-openpgp.c

@@ -2516,19 +2520,46 @@ pgp_update_new_algo_attr(sc_card_t *card, sc_cardctl_openpgp_keygen_info_t *key_

 	if (priv->ext_caps & EXT_CAP_ALG_ATTR_CHANGEABLE) {
 		/* ECDSA and ECDH */
+		/* TODO -DEE could map new OIDs to old OID needed for card here */


please integrate this comment to the one a couple of lines below to give it more context

Removed the comments as ec_curves_alt below is used to convert RFC 8410 OID to olde OIDs that are written to the card.

frankmorgner · 2024-04-17T22:19:53Z

src/libopensc/pkcs15-algo.c

-	/* RFC 8410, needed to parse/create X509 certs/pubkeys */
-	{ SC_ALGORITHM_EDDSA, {{1, 3, 101, 112, -1}}, NULL, NULL, NULL },
+	/* RFC 8410, needed to parse/create X509 certs/pubkeys  */
+	/* TODO DEE add asn1_decode_ec_params, asn1_encode_ec_params,asn1_free_ec_params */


Please remove the DEE identifier (git history has information about the author)

Also, please also add this very comment to the SC_ALGORITHM_XEDDSA block below

Removed comment and added the asn1_decode_ec_params, asn1_encode_ec_params,asn1_free_ec_params as needed.

frankmorgner · 2024-04-17T22:22:46Z

src/libopensc/pkcs15-prkey.c

@@ -569,20 +569,12 @@ sc_pkcs15_erase_prkey(struct sc_pkcs15_prkey *key)
 	case SC_ALGORITHM_GOSTR3410:
 		free(key->u.gostr3410.d.data);
 		break;
-	case SC_ALGORITHM_EC:
+	case SC_ALGORITHM_EC: /* EC, Edwards and Montgomery use common ec params */


Please put this comment into a new line

frankmorgner · 2024-04-17T22:32:15Z

src/libopensc/pkcs15-pubkey.c

-			sc_encode_oid (ctx, &id, &buf, &len);
+	if (ecparams->der.value && ecparams->der.len && ecparams->der.len > 2) {
+		/* caller provided a der version of OID */
+		switch (ecparams->der.value[0]) {


Instead of handling the ASN.1 buffer by hand in case 0x13, please use sc_asn1_read_tag directly.

frankmorgner · 2024-04-17T22:37:07Z

src/pkcs15init/pkcs15-openpgp.c

-	/* extract oid the way we need to import it to OpenPGP Card */
+	/* DEE NO extract oid the way we need to import it to OpenPGP Card */
+	/* TODO DEE pass the oid. will convert to asn1 before writing */
+	/* TODO DEE not sure id test for der.len >2 is needed */


Please remove the DEE identifier. Also, I do not understand what the comments try to tell me. Please clarify the comment or remove it.

frankmorgner · 2024-04-17T22:40:00Z

src/tools/pkcs11-tool.c

@@ -2426,6 +2441,7 @@ static void verify_signature(CK_SLOT_ID slot, CK_SESSION_HANDLE session,
 			unsigned char rs_buffer[512];
 			bytes = getEC_POINT(session, key, &len);
 			free(bytes);
+			/* TODO DEE EDDSA and EC_POINT returned in BIT STRING needs some work */


please remove the DEE identifier

frankmorgner · 2024-04-17T22:48:19Z

src/tools/pkcs15-init.c

 static const struct alg_spec alg_types_asym[] = {
-	{ "rsa",	SC_ALGORITHM_RSA,	1024 },
+	{ "rsa",	SC_ALGORITHM_RSA,	2048 }, /* new default */


Although this is a big jump, 3000 bits should be the recommended minimum key size nowadays

frankmorgner · 2024-04-17T22:49:19Z

src/tools/pkcs15-init.c

@@ -749,9 +770,18 @@ parse_alg_spec(const struct alg_spec *types, const char *spec, unsigned int *key
 	if (*spec == '/' || *spec == '-' || *spec == ':')
 		spec++;

+	/* if we have everything for EDDSA or XEDDSA */
+	if (*spec == 0x00 && *keybits && (algorithm == SC_ALGORITHM_EDDSA || algorithm == SC_ALGORITHM_XEDDSA) && prkey) {
+		prkey->u.ec.params.named_curve = strdup(types[types_idx].spec); /* correct case */


could use some error checking on strdup

As suggested in comments in OpenSC#3090 simplify code when clearing a pubkey. Not shown in diff next line is: sc_mem_clear(key, sizeof(*key)); Date: Thu Mar 28 15:37:32 2024 -0500 On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

On branch X25519-improvements-2 Changes to be committed: modified: tools/pkcs11-tool.c

1.3.6.1.4.1159.15.1 should be 1.3.6.1.4.11591.15.1 openpgp writes 2B 06 01 04 01 DA 47 0F 01 to card which comes from OID 06 09 2B 06 01 04 01 DA 47 0F 01 https://lapo.it/asn1js/ (asn.1 parser) reports this as: OBJECT IDENTIFIER 1.3.6.1.4.1.11591.15.1 curve25519 (GNU encryption algorithm) https://www.gnupg.org/oids.html lists this as Ed25519 On branch X25519-improvements-2 Changes to be committed: modified: tools/pkcs11-tool.c

…RYPT On branch X25519-improvements-2 Changes to be committed: modified: tools/pkcs11-tool.c

OpenSSL treats EVP_PKEY_EC, EVP_PKEY_X25519 and EVP_PKEY_X448 as different key types. Refer to the other key as a peer key. Use mech_mech as it is passed into derive_ec_key. On branch X25519-improvements-2 Changes to be committed: modified: src/tools/pkcs11-tool.c

On branch X25519-improvements-2 Changes to be committed: modified: tools/pkcs11-tool.c

EVP_KEY_X25519 is defined but not EVP_KEY_X448. Test if defined. Changes to be committed: modified: src/tools/pkcs11-tool.c

CKA_EC_POINT for eddsa and xeddsa are bit strings. Changes to be committed: modified: src/tools/pkcs11-tool.c

Accept either encoding. On branch X25519-improvements-2 Changes to be committed: modified: src/tools/pkcs11-tool.c

On branch X25519-improvements-2 Changes to be committed: modified: pkcs11-tool.c

…NTGOMERY Remove redundent code for struct sc_pkcs15_prkey_eddsa eddsa. Please enter the commit message for your changes. Lines starting

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/pkcs15-prkey.c modified: libopensc/pkcs15-pubkey.c

See opensc issue OpenSC#3000 On branch X25519-improvements-2 Changes to be committed: modified: libopensc/card-openpgp.c modified: libopensc/pkcs15-pubkey.c modified: tools/pkcs11-tool.c modified: tools/pkcs15-init.c

p11test is still using old way. On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

Added github/restart-pcscd.sh On branch X25519-improvements-2 Changes to be committed: modified: test-oseid.sh

This is unrelated to to the PR so if needed submit as seperate PR This reverts commit 00c4a73. On branch X25519-improvements-2 Changes to be committed: modified: .github/test-oseid.sh

On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

As suggested in comments in OpenSC#3090 simplify code when clearing a pubkey. Not shown in diff next line is: sc_mem_clear(key, sizeof(*key)); Date: Thu Mar 28 15:37:32 2024 -0500 On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

Code style from yshui/git-clang-format-lint On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

Code style from yshui/git-clang-format-lint On branch X25519-improvements-2 Changes to be committed: modified: src/libopensc/card-openpgp.c

Code style from yshui/git-clang-format-lint On branch X25519-improvements-2 Changes to be committed: modified: src/pkcs11/framework-pkcs15.c

Code style from yshui/git-clang-format-lint On branch X25519-improvements-2 Changes to be committed: modified: src/libopensc/pkcs15-algo.c

Code style from yshui/git-clang-format-lint On branch X25519-improvements-2 Changes to be committed: modified: src/tools/pkcs15-init.c

As suggeseted by .github/workflows/doc.yml On branch X25519-improvements-2 Changes to be committed: modified: files/files.html modified: tools/tools.html

On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/card-openpgp.c

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/pkcs15-algo.c

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/pkcs15-prkey.c

On branch X25519-improvements-2 Changes to be committed: modified: tools/pkcs11-tool.c

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/pkcs15-pubkey.c

Make it easier to tell difference between EC, EDDSA and XEDDSA On branch X25519-improvements-2 Changes to be committed: modified: src/libopensc/opensc.h modified: src/libopensc/pkcs15-pubkey.c

On branch X25519-improvements-2 Changes to be committed: modified: src/libopensc/card-openpgp.c modified: src/libopensc/card-openpgp.h

Changes to be committed: modified: libopensc/card.c

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/pkcs15-pubkey.c

Two fields were being copied from the dst the src sc_copy_ec_params is only used in pkcs15init/pkcs15-lib.c On branch X25519-improvements-2 Changes to be committed: modified: libopensc/card.c

On branch X25519-improvements-2 Changes to be committed: modified: ../pkcs15init/pkcs15-lib.c

On branch X25519-improvements-2 Changes to be committed: modified: card.c

…DSA work On branch X25519-improvements-2 Changes to be committed: modified: src/pkcs15init/pkcs15-openpgp.c

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/card-openpgp.c

dengert · 2024-04-29T11:51:02Z

Thanks. A lot to keep me busy

…

On Mon, Apr 29, 2024, 2:58 AM Jakub Jelen ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In src/libopensc/pkcs15-pubkey.c <#3090 (comment)>: > + volatile int gdb_test = 0; /* so can reset via gdb for testing new way */ LOG_FUNC_CALLED(ctx); sc_copy_asn1_entry(c_asn1_ec_pointQ, asn1_ec_pointQ); - sc_format_asn1_entry(asn1_ec_pointQ + 0, key->ecpointQ.value, &key->ecpointQ.len, 1); + + if (gdb_test == 1) { + key_len = key->ecpointQ.len * 8; /* encode in bit string */ + sc_format_asn1_entry(asn1_ec_pointQ + 0, key->ecpointQ.value, &key_len, 1); + } else { + key_len = key->ecpointQ.len; + sc_format_asn1_entry(asn1_ec_pointQ + 1, key->ecpointQ.value, &key_len, 1); + } I had some discussion on the OASIS PKCS#11 mailing list to get the format clarified, but as far as I remember, they were not able to provide much more clarity (I do not follow the discussions there much now) There was recently exactly this topic discussed here: https://lists.oasis-open.org/archives/pkcs11/202310/msg00008.html There seems to be some changes in the PKCS#11 3.1. Let me know if there is something else to bring up there. — Reply to this email directly, view it on GitHub <#3090 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAGTIMKGEAR7RIWIPSIE7S3Y7X4SFAVCNFSM6AAAAABFK7PMO6VHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDAMRXG44DQNJZGA> . You are receiving this because you authored the thread.Message ID: ***@***.***>

github-advanced-security bot found potential problems Mar 27, 2024

View reviewed changes

src/libopensc/pkcs15-pubkey.c Fixed Show fixed Hide fixed

Jakuje reviewed Mar 27, 2024

View reviewed changes

dengert force-pushed the X25519-improvements-2 branch from e8f1dd1 to 4bcfbe7 Compare March 28, 2024 14:25

github-advanced-security bot found potential problems Mar 30, 2024

View reviewed changes

src/libopensc/pkcs15-pubkey.c Dismissed Show dismissed Hide dismissed

dengert force-pushed the X25519-improvements-2 branch from 496b5ab to 934084a Compare March 30, 2024 15:43

dengert force-pushed the X25519-improvements-2 branch 2 times, most recently from 56e89c3 to ae71812 Compare April 5, 2024 14:45

Jakuje reviewed Apr 17, 2024

View reviewed changes

frankmorgner reviewed Apr 17, 2024

View reviewed changes

dengert force-pushed the X25519-improvements-2 branch from 6bc0d76 to 6d3d21c Compare April 18, 2024 00:34

dengert added 11 commits April 27, 2024 15:23

pkcs11-tool.c - fix tag len in OID

06baeef

On branch X25519-improvements-2 Changes to be committed: modified: tools/pkcs11-tool.c

pkcs11-tool.c - CKK_GENERIC_SECRET do not have CKA_ENCRYPT or CKA_DEC…

c491174

…RYPT On branch X25519-improvements-2 Changes to be committed: modified: tools/pkcs11-tool.c

pkcs11-tool.c - Update EC type curves

16d3fb2

On branch X25519-improvements-2 Changes to be committed: modified: tools/pkcs11-tool.c

pkcs11-tool.c - EVP_KEY_X448 not defined in LibreSSL

88452f8

EVP_KEY_X25519 is defined but not EVP_KEY_X448. Test if defined. Changes to be committed: modified: src/tools/pkcs11-tool.c

pkcs11-tool.c calculate size in bits for eddsa and xeddsa CKA_EC_POINT

6da0c2c

CKA_EC_POINT for eddsa and xeddsa are bit strings. Changes to be committed: modified: src/tools/pkcs11-tool.c

pkcs11-tool.c - EC_POINT DER in BIT STRING or OCTET STRING

c0497a3

Accept either encoding. On branch X25519-improvements-2 Changes to be committed: modified: src/tools/pkcs11-tool.c

pkcs11-tool.c - remore wrap/unwrap from template

a3bb0c0

On branch X25519-improvements-2 Changes to be committed: modified: pkcs11-tool.c

pkcs15.h - PKCS11 ecparams are used by CKK_EC, CKK_EDWARDS and CKK_MO…

5e10b68

…NTGOMERY Remove redundent code for struct sc_pkcs15_prkey_eddsa eddsa. Please enter the commit message for your changes. Lines starting

pkcs15-prkey.c pkcs15-pubkey.c - Use common EC params

158843a

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/pkcs15-prkey.c modified: libopensc/pkcs15-pubkey.c

dengert added 27 commits April 27, 2024 15:23

WIP to accept pkcs11 ec_point encoded in bit string or byte string

ba27ca5

See opensc issue OpenSC#3000 On branch X25519-improvements-2 Changes to be committed: modified: libopensc/card-openpgp.c modified: libopensc/pkcs15-pubkey.c modified: tools/pkcs11-tool.c modified: tools/pkcs15-init.c

pkcs15-pubkey.c make default for CKA_EC_POINT to return old OCTET STRING

c450203

p11test is still using old way. On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

test-oseid.sh use restart-pcscd.sh

de9e80c

Added github/restart-pcscd.sh On branch X25519-improvements-2 Changes to be committed: modified: test-oseid.sh

Revert "test-oseid.sh use restart-pcscd.sh"

0999e2c

This is unrelated to to the PR so if needed submit as seperate PR This reverts commit 00c4a73. On branch X25519-improvements-2 Changes to be committed: modified: .github/test-oseid.sh

pkcs15-pubkey.c fix bug found by fuzzer

8dad10e

On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

pkcs15-pubkey.c - comments, whitespace and code style

846384f

Code style from yshui/git-clang-format-lint On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

card-openpgp.c - whitespace and code style

f85eae2

Code style from yshui/git-clang-format-lint On branch X25519-improvements-2 Changes to be committed: modified: src/libopensc/card-openpgp.c

framework-pkcs15,c - whitespace and code style

0f67087

Code style from yshui/git-clang-format-lint On branch X25519-improvements-2 Changes to be committed: modified: src/pkcs11/framework-pkcs15.c

pkcs15-alg.c whitespace and code style

1a3f0e8

Code style from yshui/git-clang-format-lint On branch X25519-improvements-2 Changes to be committed: modified: src/libopensc/pkcs15-algo.c

pkcs15-init.c whitespace and code style

afd1f14

Code style from yshui/git-clang-format-lint On branch X25519-improvements-2 Changes to be committed: modified: src/tools/pkcs15-init.c

files.html, tools.html - rebuild

b79660d

As suggeseted by .github/workflows/doc.yml On branch X25519-improvements-2 Changes to be committed: modified: files/files.html modified: tools/tools.html

pkcs15-pubkey.c - readability of mapped_string

d23c37c

On branch X25519-improvements-2 Changes to be committed: modified: pkcs15-pubkey.c

card-openpgp.c - renove TODO comments as code was added

9a46325

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/card-openpgp.c

pkcs15-algo.c - removed comments and added asn1 calls

59fb6c5

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/pkcs15-algo.c

pkcs15-prkey.c - moved comment

b1560dd

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/pkcs15-prkey.c

pkcs11-tool.c - formating

a3afca4

On branch X25519-improvements-2 Changes to be committed: modified: tools/pkcs11-tool.c

pkcs15-pubkey.c - Use sc_asn1_read_tag for printable string

89f889f

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/pkcs15-pubkey.c

pkcs15-pubkey.c opensc.h - Add SC_ALGORITHM_* to ec_curve_info

4ce3fb0

Make it easier to tell difference between EC, EDDSA and XEDDSA On branch X25519-improvements-2 Changes to be committed: modified: src/libopensc/opensc.h modified: src/libopensc/pkcs15-pubkey.c

card-openpgp.c card-openpgp.h - Add SC_ALGORITHM_* to ec_curves_openpgp*

9c58fd2

On branch X25519-improvements-2 Changes to be committed: modified: src/libopensc/card-openpgp.c modified: src/libopensc/card-openpgp.h

card.c - when adding an EC type alg call sc_pkcs15_fix_ec_parameters

bd46e13

Changes to be committed: modified: libopensc/card.c

pkcs15-pubkey.c - FIXUP order of key_type in sc_curve_info

f462358

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/pkcs15-pubkey.c

card.c - fix bug in sc_copy_ec_params

c12b2d0

Two fields were being copied from the dst the src sc_copy_ec_params is only used in pkcs15init/pkcs15-lib.c On branch X25519-improvements-2 Changes to be committed: modified: libopensc/card.c

pkcs15init/pkcs15-openpgp.c - test id and ec type keys

ee213b9

On branch X25519-improvements-2 Changes to be committed: modified: ../pkcs15init/pkcs15-lib.c

card.c when copying sc_ec_parameters get new key_type too

ac62195

On branch X25519-improvements-2 Changes to be committed: modified: card.c

pkcs15init/pkcs15-openpgp.c - set key_info.algorithm so EDDSA and XED…

af63851

…DSA work On branch X25519-improvements-2 Changes to be committed: modified: src/pkcs15init/pkcs15-openpgp.c

card-openpgp.c - fix invalid read found by valgrind

53b43b6

On branch X25519-improvements-2 Changes to be committed: modified: libopensc/card-openpgp.c

dengert force-pushed the X25519-improvements-2 branch from 6d3d21c to 53b43b6 Compare April 27, 2024 20:25

dengert mentioned this pull request May 9, 2024

Montgomery and (Edwards) Key Generation, Use, and Interoperability #2952

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

X25519 improvements 2 in PKCS11-tool, PKCS15 routines and tools and openpgp #3090

X25519 improvements 2 in PKCS11-tool, PKCS15 routines and tools and openpgp #3090

dengert commented Mar 27, 2024

Jakuje Mar 27, 2024

dengert Mar 28, 2024

Jakuje Apr 17, 2024 •

edited

dengert Apr 17, 2024

Jakuje Apr 29, 2024

Jakuje Mar 27, 2024

dengert Mar 28, 2024

Jakuje Mar 28, 2024

Jakuje Mar 27, 2024

Jakuje Mar 27, 2024

dengert Mar 28, 2024

dengert commented Mar 28, 2024

Jakuje commented Mar 28, 2024

dengert commented Mar 28, 2024

Jakuje commented Apr 3, 2024

dengert commented Apr 3, 2024

Jakuje commented Apr 4, 2024

Jakuje left a comment

Jakuje Apr 17, 2024

dengert Apr 17, 2024

frankmorgner left a comment

frankmorgner Apr 17, 2024

dengert Apr 18, 2024

frankmorgner Apr 17, 2024

dengert Apr 18, 2024

frankmorgner Apr 17, 2024

frankmorgner Apr 17, 2024

frankmorgner Apr 17, 2024

frankmorgner Apr 17, 2024

frankmorgner Apr 17, 2024

frankmorgner Apr 17, 2024

dengert commented Apr 29, 2024 via email

		{CKA_WRAP, &_true, sizeof(_true)},
		{CKA_UNWRAP, &_true, sizeof(_true)}

X25519 improvements 2 in PKCS11-tool, PKCS15 routines and tools and openpgp #3090

Are you sure you want to change the base?

X25519 improvements 2 in PKCS11-tool, PKCS15 routines and tools and openpgp #3090

Conversation

dengert commented Mar 27, 2024

Checklist

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Jakuje Apr 17, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dengert commented Mar 28, 2024

Jakuje commented Mar 28, 2024

dengert commented Mar 28, 2024

Jakuje commented Apr 3, 2024

dengert commented Apr 3, 2024

Jakuje commented Apr 4, 2024

Jakuje left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

frankmorgner left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dengert commented Apr 29, 2024 via email

Jakuje Apr 17, 2024 •

edited