Nss rsa #259

nmathewson · 2018-08-01T01:30:13Z

No description provided.

When it is set, include the NSS headers and libraries as appropriate. Doesn't actually use them yet, though.

These are now part of crypto_init.c. The openssl-only parts now live in crypto_openssl_mgt.c. I recommend reviewing this patch with -b and --color-moved.

This is largely conjectural, based on online documentation for NSS and NSPR.

We need this in our unit tests, since otherwise NSS will notice we've forked and start cussing us out. I suspect we'll need a different hack for daemonizing, but this should be enough for tinytest to work.

This was a fairly straightforward port, once I realized which layer I should be calling into.

This is comparatively straightforward too, except for a couple of twists: * For as long as we're building with two crypto libraries, we want to seed _both_ their RNGs, and use _both_ their RNGs to improve the output of crypto_strongest_rand() * The NSS prng will sometimes refuse to generate huge outputs. When it does, we stretch the output with SHAKE. We only need this for the tests.

We only ever need this to get us a DH ephemeral key object, so make a function that does just that.

Notably, there's a test to make sure that it round-trips with OpenSSL, if OpenSSL is enabled.

(We do this unconditionally, since we still need it for tortls.c)

coveralls · 2018-08-11T21:52:10Z

Coverage increased (+0.06%) to 59.609% when pulling 3ccb94d on nmathewson:nss_rsa into 9bb0ac4 on torproject:master.

It is not nice to expose a private key's contents without having the function name advertise the fact. Fortunately, we weren't misusing these yet.

These functions exist only to expose RSA keys to other places in Tor that use OpenSSL; let's be specific about their purpose.

This cleans up a lot of junk from crypto_rsa_openssl, and will save us duplicated code in crypto_rsa_nss (when it exists). (Actually, it already exists, but I am going to use git rebase so that this commit precedes the creation of crypto_rsa_nss.)

src/lib/crypt_ops/crypto_rsa_nss.c

src/lib/crypt_ops/crypto_rsa.c

asn-d6 · 2018-08-29T12:04:31Z

src/lib/crypt_ops/crypto_rsa.c

+crypto_pk_base64_decode_private(const char *str, size_t len)
+{
+  crypto_pk_t *pk = NULL;
+


It's not documented in this function what len is here. It's the siez of str and also the size of der? Shouldn't base64_decode() expand the data such that it doesn't fit?

src/lib/crypt_ops/crypto_rsa_nss.c

asn-d6 · 2018-08-29T12:08:35Z

src/lib/crypt_ops/crypto_rsa_nss.c

+crypto_pk_asn1_encode(const crypto_pk_t *pk, char *dest, size_t dest_len)
+{
+  tor_assert(pk);
+  if (pk->pubkey == NULL)


Should we use check_key?

asn-d6

review

asn-d6

review

nmathewson added 30 commits Jul 11, 2018

Make our crypto library symbolic in the makefiles.

92db96d

Add a configure switch to build with NSS.

79267ba

When it is set, include the NSS headers and libraries as appropriate. Doesn't actually use them yet, though.

Move the initialization and cleanup parts of crypto.c

12a1ada

These are now part of crypto_init.c. The openssl-only parts now live in crypto_openssl_mgt.c. I recommend reviewing this patch with -b and --color-moved.

Move crypto_add_spaces_to_fp() to crypto_rsa.c

8e2df98

Extract and rename crypto_log_errors().

922208b

Remove most includes from crypto.c

9010797

Rename crypto.c to crypto_cipher.c (since that's all it still has.)

f45107e

Initialize and shut down NSS.

c317e78

This is largely conjectural, based on online documentation for NSS and NSPR.

Add postfork support for nss

d811ce2

We need this in our unit tests, since otherwise NSS will notice we've forked and start cussing us out. I suspect we'll need a different hack for daemonizing, but this should be enough for tinytest to work.

Make nss get initialized before we fuzz anything.

27dd2b1

Use NSS's digest code in Tor.

f64c9dc

This was a fairly straightforward port, once I realized which layer I should be calling into.

Make sure NSS is initialized before running benchmarks

be8d497

Use NSS for AES_CTR.

76e10ee

Changes files for feature26815 and 26816

e7a0616

Fix "make distcheck."

2d80673

Make the rust tests link.

99beed1

Extract the OpenSSL DH functionality to a new file.

60a5b78

Extract the shared part of crypto_dh_compute_secret.

ac9a470

Refactor the dependency between tortls and crypto_dh.

32bbc8f

We only ever need this to get us a DH ephemeral key object, so make a function that does just that.

Implement DH in NSS.

17ea931

Additional tests for NSS DH

f5e2235

Notably, there's a test to make sure that it round-trips with OpenSSL, if OpenSSL is enabled.

Only link crypto_dh_openssl.c once

17f922d

(We do this unconditionally, since we still need it for tortls.c)

Merge branch 'nss_dh_squashed' into nss_dh_squashed_merged

fdaa483

Fix issues with crypto_ope compilation now that crypto.h is gone

a4c0a0e

Add a cast to make clang happier.

b590cc0

Fix double-link of crypto_openssl_mgt.c

727f167

Suppress strict-prototypes warning in crypto_nss_mgt.c

f83b417

When RunAsDaemon is set, crypto_postfork() as needed

4f300d5

Make finish_daemon() return a boolean to say whether it did anything.

622a2c6

Call crypto_postfork on start_daemon() instead.

a57c27a

nmathewson force-pushed the nss_rsa branch 2 times, most recently from b7fef99 to 857aed8 Aug 11, 2018

nmathewson added 11 commits Aug 14, 2018

Adjust windows stubs for new start/finish_daemon() return types

e56f0c9

Extract openssl RSA functionality into its own file.

752ffa2

Rename functions that encode/decode private keys

0f971d7

It is not nice to expose a private key's contents without having the function name advertise the fact. Fortunately, we weren't misusing these yet.

Remove a redundant function.

38212d2

Rename openssl-bridging functions in crypto_rsa

824009c

These functions exist only to expose RSA keys to other places in Tor that use OpenSSL; let's be specific about their purpose.

Use a constant for "65537"

0812f1c

Add rudimentary support for PEM-encoding, since NSS doesn't do that.

9566ed6

Refactor crypto_rsa to use pem module.

b94e7de

This cleans up a lot of junk from crypto_rsa_openssl, and will save us duplicated code in crypto_rsa_nss (when it exists). (Actually, it already exists, but I am going to use git rebase so that this commit precedes the creation of crypto_rsa_nss.)

Also reinitialize the pregenerated keys postfork.

cb5cfe3

Implement RSA for NSS.

aa45511

The RSA_free in this test is no longer needed or wanted

3ccb94d

nmathewson force-pushed the nss_rsa branch from 857aed8 to 3ccb94d Aug 21, 2018