crypto/openpgp_symmetric_encryption_openssl.cc - Issue 7273080: crypto: convert OpenPGP code to NSS

Unified Diff: crypto/openpgp_symmetric_encryption_openssl.cc

Issue 7273080: crypto: convert OpenPGP code to NSS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: ... Created 9 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: crypto/openpgp_symmetric_encryption_openssl.cc

diff --git a/crypto/openpgp_symmetric_encryption_openssl.cc b/crypto/openpgp_symmetric_encryption_openssl.cc

deleted file mode 100644

index bebf095deda65473deff30dc8102a1419a7bfc36..0000000000000000000000000000000000000000

--- a/crypto/openpgp_symmetric_encryption_openssl.cc

+++ /dev/null

@@ -1,707 +0,0 @@

-// Use of this source code is governed by a BSD-style license that can be

-// found in the LICENSE file.

-#include "crypto/openpgp_symmetric_encryption.h"

-#include <vector>

-#include <stdlib.h>

-#include <openssl/evp.h>

-#include <openssl/aes.h>

-#include <openssl/sha.h>

-#include "base/rand_util.h"

-#include "base/logging.h"

-namespace crypto {

-namespace {

-// Reader wraps a StringPiece and provides methods to read several datatypes

-// while advancing the StringPiece.

-class Reader {

- public:

- Reader(base::StringPiece input)

- : data_(input) {

- }

- bool U8(uint8* out) {

- if (data_.size() < 1)

- return false;

- *out = static_cast<uint8>(data_[0]);

- data_.remove_prefix(1);

- return true;

- }

- bool U32(uint32* out) {

- if (data_.size() < 4)

- return false;

- *out = static_cast<uint32>(data_[0]) << 24 |

- static_cast<uint32>(data_[1]) << 16 |

- static_cast<uint32>(data_[2]) << 8 |

- static_cast<uint32>(data_[3]);

- data_.remove_prefix(4);

- return true;

- }

- // Prefix sets |*out| to the first |n| bytes of the StringPiece and advances

- // the StringPiece by |n|.

- bool Prefix(uint32 n, base::StringPiece *out) {

- if (data_.size() < n)

- return false;

- *out = base::StringPiece(data_.data(), n);

- data_.remove_prefix(n);

- return true;

- }

- // Remainder returns the remainer of the StringPiece and advances it to the

- // end.

- base::StringPiece Remainder() {

- base::StringPiece ret = data_;

- data_ = base::StringPiece();

- return ret;

- }

- typedef base::StringPiece Position;

- Position tell() const {

- return data_;

- }

- void Seek(Position p) {

- data_ = p;

- }

- bool Skip(uint32 n) {

- if (data_.size() < n)

- return false;

- data_.remove_prefix(n);

- return true;

- }

- bool empty() const {

- return data_.empty();

- }

- size_t size() const {

- return data_.size();

- }

- private:

- base::StringPiece data_;

-};

-// SaltedIteratedS2K implements the salted and iterated string-to-key

-// convertion. See RFC 4880, section 3.7.1.3.

-void SaltedIteratedS2K(uint32 cipher_key_length,

- const EVP_MD *hash_function,

- base::StringPiece passphrase,

- base::StringPiece salt,

- uint32 count,

- uint8 *out_key) {

- const std::string combined = salt.as_string() + passphrase.as_string();

- const size_t combined_len = combined.size();

- uint32 done = 0;

- uint8 zero[1] = {0};

- EVP_MD_CTX ctx;

- EVP_MD_CTX_init(&context);

- for (uint32 i = 0; done < cipher_key_length; i++) {

- CHECK_EQ(EVP_DigestInit_ex(&ctx, hash_function, NULL), 1);

- for (uint32 j = 0; j < i; j++)

- EVP_DigestUpdate(&ctx, zero, sizeof(zero));

- uint32 written = 0;

- while (written < count) {

- if (written + combined_len > count) {

- uint32 todo = count - written;

- EVP_DigestUpdate(&ctx, combined.data(), todo);

- written = count;

- } else {

- EVP_DigestUpdate(&ctx, combined.data(), combined_len);

- written += combined_len;

- }

- uint32 num_hash_bytes;

- uint8 hash[EVP_MAX_MD_SIZE];

- CHECK_EQ(EVP_DigestFinal_ex(&ctx, hash, &num_hash_bytes), 1);

- uint32 todo = cipher_key_length - done;

- if (todo > num_hash_bytes)

- todo = num_hash_bytes;

- memcpy(out_key + done, hash, todo);

- done += todo;

- }

- EVP_MD_CTX_cleanup(&context);

-// These constants are the tag numbers for the various packet types that we

-// use.

-static const uint32 kSymmetricKeyEncryptedTag = 3;

-static const uint32 kSymmetricallyEncryptedTag = 18;

-static const uint32 kCompressedTag = 8;

-static const uint32 kLiteralDataTag = 11;

-class Decrypter {

- public:

- ~Decrypter() {

- for (std::vector<void*>::iterator

- i = arena_.begin(); i != arena_.end(); i++) {

- free(*i);

- }

- arena_.clear();

- }

- OpenPGPSymmetricEncrytion::Result Decrypt(base::StringPiece in,

- base::StringPiece passphrase,

- base::StringPiece *out_contents) {

- Reader reader(in);

- uint32 tag;

- base::StringPiece contents;

- AES_KEY key;

- if (!ParsePacket(&reader, &tag, &contents))

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- if (tag != kSymmetricKeyEncryptedTag)

- return OpenPGPSymmetricEncrytion::NOT_SYMMETRICALLY_ENCRYPTED;

- Reader inner(contents);

- OpenPGPSymmetricEncrytion::Result result =

- ParseSymmetricKeyEncrypted(&inner, passphrase, &key);

- if (result != OpenPGPSymmetricEncrytion::OK)

- return result;

- if (!ParsePacket(&reader, &tag, &contents))

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- if (tag != kSymmetricallyEncryptedTag)

- return OpenPGPSymmetricEncrytion::NOT_SYMMETRICALLY_ENCRYPTED;

- if (!reader.empty())

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- inner = Reader(contents);

- if (!ParseSymmetricallyEncrypted(&inner, &key, &contents))

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- reader = Reader(contents);

- if (!ParsePacket(&reader, &tag, &contents))

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- if (tag == kCompressedTag)

- return OpenPGPSymmetricEncrytion::COMPRESSED;

- if (tag != kLiteralDataTag)

- return OpenPGPSymmetricEncrytion::NOT_SYMMETRICALLY_ENCRYPTED;

- inner = Reader(contents);

- if (!ParseLiteralData(&inner, out_contents))

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- return OpenPGPSymmetricEncrytion::OK;

- }

- private:

- // ParsePacket parses an OpenPGP packet from reader. See RFC 4880, section

- // 4.2.2.

- bool ParsePacket(Reader *reader,

- uint32 *out_tag,

- base::StringPiece *out_contents) {

- uint8 header;

- if (!reader->U8(&header))

- return false;

- if ((header & 0x80) == 0) {

- // Tag byte must have MSB set.

- return false;

- }

- if ((header & 0x40) == 0) {

- // Old format packet.

- *out_tag = (header & 0x3f) >> 2;

- uint8 length_type = header & 3;

- if (length_type == 3) {

- *out_contents = reader->Remainder();

- return true;

- }

- const uint32 length_bytes = 1 << length_type;

- uint32 length = 0;

- for (uint32 i = 0; i < length_bytes; i++) {

- uint8 length_byte;

- if (!reader->U8(&length_byte))

- return false;

- length <<= 8;

- length |= length_byte;

- }

- return reader->Prefix(length, out_contents);

- }

- // New format packet.

- *out_tag = header & 0x3f;

- uint32 length;

- bool is_partial;

- if (!ParseLength(reader, &length, &is_partial))

- return false;

- if (is_partial)

- return ParseStreamContents(reader, length, out_contents);

- return reader->Prefix(length, out_contents);

- }

- // ParseStreamContents parses all the chunks of a partial length stream from

- // reader. See http://tools.ietf.org/html/rfc4880#section-4.2.2.4

- bool ParseStreamContents(Reader *reader,

- uint32 length,

- base::StringPiece *out_contents) {

- const Reader::Position beginning_of_stream = reader->tell();

- const uint32 first_chunk_length = length;

- // First we parse the stream to find its length.

- if (!reader->Skip(length))

- return false;

- for (;;) {

- uint32 chunk_length;

- bool is_partial;

- if (!ParseLength(reader, &chunk_length, &is_partial))

- return false;

- if (length + chunk_length < length)

- return false;

- length += chunk_length;

- if (!reader->Skip(chunk_length))

- return false;

- if (!is_partial)

- break;

- }

- // Now we have the length of the whole stream in |length|.

- char* buf = reinterpret_cast<char*>(malloc(length));

- arena_.push_back(buf);

- uint32 j = 0;

- reader->Seek(beginning_of_stream);

- base::StringPiece first_chunk;

- if (!reader->Prefix(first_chunk_length, &first_chunk))

- return false;

- memcpy(buf + j, first_chunk.data(), first_chunk_length);

- j += first_chunk_length;

- // Now we parse the stream again, this time copying into |buf|

- for (;;) {

- uint32 chunk_length;

- bool is_partial;

- if (!ParseLength(reader, &chunk_length, &is_partial))

- return false;

- base::StringPiece chunk;

- if (!reader->Prefix(chunk_length, &chunk))

- return false;

- memcpy(buf + j, chunk.data(), chunk_length);

- j += chunk_length;

- if (!is_partial)

- break;

- }

- *out_contents = base::StringPiece(buf, length);

- return true;

- }

- // ParseLength parses an OpenPGP length from reader. See RFC 4880, section

- // 4.2.2.

- bool ParseLength(Reader *reader, uint32 *out_length, bool *out_is_prefix) {

- uint8 length_spec;

- if (!reader->U8(&length_spec))

- return false;

- *out_is_prefix = false;

- if (length_spec < 192) {

- *out_length = length_spec;

- return true;

- } else if (length_spec < 224) {

- uint8 next_byte;

- if (!reader->U8(&next_byte))

- return false;

- *out_length = (length_spec - 192) << 8;

- *out_length += next_byte;

- return true;

- } else if (length_spec < 255) {

- *out_length = 1u << (length_spec & 0x1f);

- *out_is_prefix = true;

- return true;

- } else {

- return reader->U32(out_length);

- }

- // ParseSymmetricKeyEncrypted parses a passphrase protected session key. See

- // RFC 4880, section 5.3.

- OpenPGPSymmetricEncrytion::Result ParseSymmetricKeyEncrypted(

- Reader *reader,

- base::StringPiece passphrase,

- AES_KEY *out_key) {

- uint8 version, cipher, s2k_type, hash_func_id;

- if (!reader->U8(&version) || version != 4)

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- if (!reader->U8(&cipher) ||

- !reader->U8(&s2k_type) ||

- !reader->U8(&hash_func_id)) {

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- }

- uint8 cipher_key_length = OpenPGPCipherIdToKeyLength(cipher);

- if (cipher_key_length == 0)

- return OpenPGPSymmetricEncrytion::UNKNOWN_CIPHER;

- const EVP_MD *hash_function;

- switch (hash_func_id) {

- case 2: // SHA-1

- hash_function = EVP_sha1();

- break;

- case 8: // SHA-256

- hash_function = EVP_sha256();

- break;

- default:

- return OpenPGPSymmetricEncrytion::UNKNOWN_HASH;

- }

- base::StringPiece salt;

- uint8 key[32];

- uint8 count_spec;

- switch (s2k_type) {

- case 1:

- if (!reader->Prefix(8, &salt))

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- case 0:

- SaltedIteratedS2K(cipher_key_length, hash_function, passphrase, salt,

- passphrase.size() + salt.size(), key);

- break;

- case 3:

- if (!reader->Prefix(8, &salt) ||

- !reader->U8(&count_spec)) {

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- }

- SaltedIteratedS2K(

- cipher_key_length, hash_function, passphrase, salt,

- static_cast<uint32>(

- 16 + (count_spec&15)) << ((count_spec >> 4) + 6), key);

- break;

- default:

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- }

- if (AES_set_encrypt_key(key, 8 * cipher_key_length, out_key))

- return OpenPGPSymmetricEncrytion::INTERNAL_ERROR;

- if (reader->empty()) {

- // The resulting key is used directly.

- return OpenPGPSymmetricEncrytion::OK;

- }

- // The S2K derived key encrypts another key that follows:

- base::StringPiece encrypted_key = reader->Remainder();

- if (encrypted_key.size() < 1)

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- uint8* plaintext_key = reinterpret_cast<uint8*>(

- malloc(encrypted_key.size()));

- arena_.push_back(plaintext_key);

- int num = 0;

- uint8 iv[16] = {0};

- AES_cfb128_encrypt(reinterpret_cast<const uint8*>(encrypted_key.data()),

- plaintext_key,

- encrypted_key.size(),

- out_key,

- iv,

- &num,

- AES_DECRYPT);

- cipher_key_length = OpenPGPCipherIdToKeyLength(plaintext_key[0]);

- if (cipher_key_length == 0)

- return OpenPGPSymmetricEncrytion::UNKNOWN_CIPHER;

- if (encrypted_key.size() != 1u + cipher_key_length)

- return OpenPGPSymmetricEncrytion::PARSE_ERROR;

- if (AES_set_encrypt_key(plaintext_key + 1, 8 * cipher_key_length,

- out_key)) {

- return OpenPGPSymmetricEncrytion::INTERNAL_ERROR;

- }

- return OpenPGPSymmetricEncrytion::OK;

- }

- uint32 OpenPGPCipherIdToKeyLength(uint8 cipher) {

- switch (cipher) {

- case 7: // AES-128

- return 16;

- case 8: // AES-192

- return 24;

- case 9: // AES-256

- return 32;

- default:

- return 0;

- }

- // ParseSymmetricallyEncrypted parses a Symmetrically Encrypted packet. See

- // RFC 4880, sections 5.7 and 5.13.

- bool ParseSymmetricallyEncrypted(Reader *reader,

- AES_KEY *key,

- base::StringPiece *out_plaintext) {

- uint8 version;

- if (!reader->U8(&version) || version != 1)

- return false;

- base::StringPiece prefix_sp;

- if (!reader->Prefix(AES_BLOCK_SIZE + 2, &prefix_sp))

- return false;

- uint8 prefix[AES_BLOCK_SIZE + 2];

- memcpy(prefix, prefix_sp.data(), sizeof(prefix));

- uint8 prefix_copy[AES_BLOCK_SIZE + 2];

- uint8 fre[AES_BLOCK_SIZE];

- memset(prefix_copy, 0, AES_BLOCK_SIZE);

- AES_ecb_encrypt(prefix_copy, fre, key, AES_ENCRYPT);

- for (uint32 i = 0; i < AES_BLOCK_SIZE; i++)

- prefix_copy[i] = fre[i] ^ prefix[i];

- AES_ecb_encrypt(prefix, fre, key, AES_ENCRYPT);

- prefix_copy[AES_BLOCK_SIZE] = prefix[AES_BLOCK_SIZE] ^ fre[0];

- prefix_copy[AES_BLOCK_SIZE + 1] = prefix[AES_BLOCK_SIZE + 1] ^ fre[1];

- if (prefix_copy[AES_BLOCK_SIZE - 2] != prefix_copy[AES_BLOCK_SIZE] ||

- prefix_copy[AES_BLOCK_SIZE - 1] != prefix_copy[AES_BLOCK_SIZE + 1]) {

- return false;

- }

- fre[0] = prefix[AES_BLOCK_SIZE];

- fre[1] = prefix[AES_BLOCK_SIZE + 1];

- uint32 out_used = 2;

- const uint32 plaintext_size = reader->size();

- if (plaintext_size < SHA_DIGEST_LENGTH + 2) {

- // Too small to contain an MDC trailer.

- return false;

- }

- uint8* plaintext = reinterpret_cast<uint8*>(malloc(plaintext_size));

- arena_.push_back(plaintext);

- for (uint32 i = 0; i < plaintext_size; i++) {

- uint8 b;

- if (!reader->U8(&b))

- return false;

- if (out_used == AES_BLOCK_SIZE) {

- AES_ecb_encrypt(fre, fre, key, AES_ENCRYPT);

- out_used = 0;

- }

- plaintext[i] = b ^ fre[out_used];

- fre[out_used++] = b;

- }

- // The plaintext should be followed by a Modification Detection Code

- // packet. This packet is specified such that the header is always

- // serialized as exactly these two bytes:

- if (plaintext[plaintext_size - SHA_DIGEST_LENGTH - 2] != 0xd3 ||

- plaintext[plaintext_size - SHA_DIGEST_LENGTH - 1] != 0x14) {

- return false;

- }

- SHA_CTX sha1;

- SHA1_Init(&sha1);

- SHA1_Update(&sha1, prefix_copy, sizeof(prefix_copy));

- SHA1_Update(&sha1, plaintext, plaintext_size - SHA_DIGEST_LENGTH);

- uint8 digest[SHA_DIGEST_LENGTH];

- SHA1_Final(digest, &sha1);

- if (memcmp(digest, &plaintext[plaintext_size - SHA_DIGEST_LENGTH],

- SHA_DIGEST_LENGTH) != 0) {

- return false;

- }

- *out_plaintext = base::StringPiece(reinterpret_cast<char*>(plaintext),

- plaintext_size - SHA_DIGEST_LENGTH);

- return true;

- }

- // ParseLiteralData parses a Literal Data packet. See RFC 4880, section 5.9.

- bool ParseLiteralData(Reader *reader, base::StringPiece *out_data) {

- uint8 is_binary, filename_len;

- if (!reader->U8(&is_binary) ||

- !reader->U8(&filename_len) ||

- !reader->Skip(filename_len) ||

- !reader->Skip(sizeof(uint32) /* mtime */)) {

- return false;

- }

- *out_data = reader->Remainder();

- return true;

- }

- // arena_ contains malloced pointers that are used as temporary space during

- // the decryption.

- std::vector<void*> arena_;

-};

-class Encrypter {

- public:

- // ByteString is used throughout in order to avoid signedness issues with a

- // std::string.

- typedef std::basic_string<uint8> ByteString;

- static ByteString Encrypt(base::StringPiece plaintext,

- base::StringPiece passphrase) {

- ByteString key;

- ByteString ske = SerializeSymmetricKeyEncrypted(passphrase, &key);

- ByteString literal_data = SerializeLiteralData(plaintext);

- ByteString se = SerializeSymmetricallyEncrypted(literal_data, key);

- return ske + se;

- }

- private:

- static ByteString MakePacket(uint32 tag, const ByteString& contents) {

- ByteString header;

- header.push_back(0x80 | 0x40 | tag);

- if (contents.size() < 192) {

- header.push_back(contents.size());

- } else if (contents.size() < 8384) {

- size_t length = contents.size();

- length -= 192;

- header.push_back(192 + (length >> 8));

- header.push_back(length & 0xff);

- } else {

- size_t length = contents.size();

- header.push_back(255);

- header.push_back(length >> 24);

- header.push_back(length >> 16);

- header.push_back(length >> 8);

- header.push_back(length);

- }

- return header + contents;

- }

- static ByteString SerializeLiteralData(base::StringPiece contents) {

- ByteString literal_data;

- literal_data.push_back(0x74); // text mode

- literal_data.push_back(0x00); // no filename

- literal_data.push_back(0x00); // zero mtime

- literal_data.push_back(0x00);

- literal_data += ByteString(reinterpret_cast<const uint8*>(contents.data()),

- contents.size());

- return MakePacket(kLiteralDataTag, literal_data);

- }

- static ByteString SerializeSymmetricKeyEncrypted(base::StringPiece passphrase,

- ByteString *out_key) {

- ByteString ske;

- ske.push_back(4); // version 4

- ske.push_back(7); // AES-128

- ske.push_back(3); // iterated and salted S2K

- ske.push_back(2); // SHA-1

- uint64 salt64 = base::RandUint64();

- ByteString salt(sizeof(salt64), 0);

- // It's a random value, so endianness doesn't matter.

- ske += ByteString(reinterpret_cast<uint8*>(&salt64), sizeof(salt64));

- ske.push_back(96); // iteration count of 65536

- uint8 key[16];

- SaltedIteratedS2K(

- sizeof(key), EVP_sha1(), passphrase,

- base::StringPiece(reinterpret_cast<char*>(&salt64), sizeof(salt64)),

- 65536, key);

- *out_key = ByteString(key, sizeof(key));

- return MakePacket(kSymmetricKeyEncryptedTag, ske);

- }

- static ByteString SerializeSymmetricallyEncrypted(ByteString plaintext,

- const ByteString& key) {

- ByteString packet;

- packet.push_back(1); // version 1

- static const uint32 kBlockSize = 16; // AES block size

- uint8 prefix[kBlockSize + 2], fre[kBlockSize], iv[kBlockSize];

- base::RandBytes(iv, kBlockSize);

- memset(fre, 0, sizeof(fre));

- AES_KEY aes_key;

- AES_set_encrypt_key(key.data(), 8 * key.size(), &aes_key);

- AES_ecb_encrypt(fre, fre, &aes_key, AES_ENCRYPT);

- for (uint32 i = 0; i < 16; i++)

- prefix[i] = iv[i] ^ fre[i];

- AES_ecb_encrypt(prefix, fre, &aes_key, AES_ENCRYPT);

- prefix[kBlockSize] = iv[kBlockSize - 2] ^ fre[0];

- prefix[kBlockSize + 1] = iv[kBlockSize - 1] ^ fre[1];

- packet += ByteString(prefix, sizeof(prefix));

- ByteString plaintext_copy = plaintext;

- plaintext_copy.push_back(0xd3); // MDC packet

- plaintext_copy.push_back(20); // packet length (20 bytes)

- SHA_CTX sha1;

- SHA1_Init(&sha1);

- SHA1_Update(&sha1, iv, sizeof(iv));

- SHA1_Update(&sha1, iv + kBlockSize - 2, 2);

- SHA1_Update(&sha1, plaintext_copy.data(), plaintext_copy.size());

- uint8 digest[SHA_DIGEST_LENGTH];

- SHA1_Final(digest, &sha1);

- plaintext_copy += ByteString(digest, sizeof(digest));

- fre[0] = prefix[kBlockSize];

- fre[1] = prefix[kBlockSize+1];

- uint32 out_used = 2;

- for (size_t i = 0; i < plaintext_copy.size(); i++) {

- if (out_used == kBlockSize) {

- AES_ecb_encrypt(fre, fre, &aes_key, AES_ENCRYPT);

- out_used = 0;

- }

- uint8 c = plaintext_copy[i] ^ fre[out_used];

- fre[out_used++] = c;

- packet.push_back(c);

- }

- return MakePacket(kSymmetricallyEncryptedTag, packet);

- }

-};

-} // anonymous namespace

-// static

-OpenPGPSymmetricEncrytion::Result OpenPGPSymmetricEncrytion::Decrypt(

- base::StringPiece encrypted,

- base::StringPiece passphrase,

- std::string *out) {

- Decrypter decrypter;

- base::StringPiece result;

- Result reader = decrypter.Decrypt(encrypted, passphrase, &result);

- if (reader == OK)

- *out = result.as_string();

- return reader;

-// static

-std::string OpenPGPSymmetricEncrytion::Encrypt(

- base::StringPiece plaintext,

- base::StringPiece passphrase) {

- Encrypter::ByteString b =

- Encrypter::Encrypt(plaintext, passphrase);

- return std::string(reinterpret_cast<const char*>(b.data()), b.size());

-} // namespace crypto

« no previous file with comments | « crypto/openpgp_symmetric_encryption_nss_unittest.cc ('k') | crypto/openpgp_symmetric_encryption_test_openssl.cc » ('j') | no next file with comments »