diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-24 01:06:04 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-24 01:06:04 +0100 |
| commit | 9e523d8a4062ad52330dff6c2ba50e54184c9bb2 (patch) | |
| tree | cc10da19d90f9ad1d17066e152602c3f88e5bf2b /src/decrypted_kdm.cc | |
| parent | 242d42f32a1fbcf9fb1fe64d8c98e907e407703d (diff) | |
No-op: whitespace.
Diffstat (limited to 'src/decrypted_kdm.cc')
| -rw-r--r-- | src/decrypted_kdm.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/decrypted_kdm.cc b/src/decrypted_kdm.cc index 9661281d..9a9a1694 100644 --- a/src/decrypted_kdm.cc +++ b/src/decrypted_kdm.cc @@ -77,7 +77,7 @@ static string get_uuid (unsigned char ** p) { stringstream g; - + for (int i = 0; i < 16; ++i) { g << setw(2) << setfill('0') << hex << static_cast<int> (**p); (*p)++; @@ -109,7 +109,7 @@ DecryptedKDM::DecryptedKDM (EncryptedKDM const & kdm, string private_key) if (!bio) { throw MiscError ("could not create memory BIO"); } - + RSA* rsa = PEM_read_bio_RSAPrivateKey (bio, 0, 0, 0); if (!rsa) { throw FileError ("could not read RSA private key file", private_key, errno); @@ -174,8 +174,8 @@ DecryptedKDM::DecryptedKDM (EncryptedKDM const & kdm, string private_key) } default: DCP_ASSERT (false); - } - + } + delete[] decrypted; } @@ -229,14 +229,14 @@ DecryptedKDM::encrypt (shared_ptr<const Signer> signer, Certificate recipient, F base64_decode (signer->certificates().leaf().thumbprint (), p, 20); p += 20; - + put_uuid (&p, i.cpl_id ()); put (&p, i.type ()); put_uuid (&p, i.id ()); put (&p, _not_valid_before.as_string ()); put (&p, _not_valid_after.as_string ()); put (&p, i.key().value(), ASDCP::KeyLen); - + /* Encrypt using the projector's public key */ RSA* rsa = recipient.public_key (); unsigned char encrypted[RSA_size(rsa)]; @@ -244,7 +244,7 @@ DecryptedKDM::encrypt (shared_ptr<const Signer> signer, Certificate recipient, F if (encrypted_len == -1) { throw MiscError (String::compose ("Could not encrypt KDM (%1)", ERR_error_string (ERR_get_error(), 0))); } - + /* Lazy overallocation */ char out[encrypted_len * 2]; Kumu::base64encode (encrypted, encrypted_len, out, encrypted_len * 2); @@ -256,7 +256,7 @@ DecryptedKDM::encrypt (shared_ptr<const Signer> signer, Certificate recipient, F } lines << out[i]; } - + keys.push_back (lines.str ()); } |
