From 0fbff7a11ebea1609eae50d0709e3f08dab98838 Mon Sep 17 00:00:00 2001 From: lloyd Date: Sun, 28 Sep 2008 22:50:07 +0000 Subject: PEM codec module --- src/algo_filt.cpp | 107 ++++++++++++++++++++++++++++++++ src/codec/openpgp/modinfo.txt | 4 ++ src/codec/pem/pem.cpp | 141 ++++++++++++++++++++++++++++++++++++++++++ src/codec/pem/pem.h | 33 ++++++++++ src/filters.cpp | 107 -------------------------------- src/pem.cpp | 141 ------------------------------------------ 6 files changed, 285 insertions(+), 248 deletions(-) create mode 100644 src/algo_filt.cpp create mode 100644 src/codec/pem/pem.cpp create mode 100644 src/codec/pem/pem.h delete mode 100644 src/filters.cpp delete mode 100644 src/pem.cpp (limited to 'src') diff --git a/src/algo_filt.cpp b/src/algo_filt.cpp new file mode 100644 index 000000000..2c8402601 --- /dev/null +++ b/src/algo_filt.cpp @@ -0,0 +1,107 @@ +/************************************************* +* Filters Source File * +* (C) 1999-2007 Jack Lloyd * +*************************************************/ + +#include +#include +#include + +namespace Botan { + +/************************************************* +* StreamCipher_Filter Constructor * +*************************************************/ +StreamCipher_Filter::StreamCipher_Filter(const std::string& sc_name) : + buffer(DEFAULT_BUFFERSIZE) + { + base_ptr = cipher = get_stream_cipher(sc_name); + } + +/************************************************* +* StreamCipher_Filter Constructor * +*************************************************/ +StreamCipher_Filter::StreamCipher_Filter(const std::string& sc_name, + const SymmetricKey& key) : + buffer(DEFAULT_BUFFERSIZE) + { + base_ptr = cipher = get_stream_cipher(sc_name); + cipher->set_key(key); + } + +/************************************************* +* Set the IV of a stream cipher * +*************************************************/ +void StreamCipher_Filter::set_iv(const InitializationVector& iv) + { + cipher->resync(iv.begin(), iv.length()); + } + +/************************************************* +* Write data into a StreamCipher_Filter * +*************************************************/ +void StreamCipher_Filter::write(const byte input[], u32bit length) + { + while(length) + { + u32bit copied = std::min(length, buffer.size()); + cipher->encrypt(input, buffer, copied); + send(buffer, copied); + input += copied; + length -= copied; + } + } + +/************************************************* +* Hash_Filter Constructor * +*************************************************/ +Hash_Filter::Hash_Filter(const std::string& hash_name, u32bit len) : + OUTPUT_LENGTH(len) + { + hash = get_hash(hash_name); + } + +/************************************************* +* Complete a calculation by a Hash_Filter * +*************************************************/ +void Hash_Filter::end_msg() + { + SecureVector output = hash->final(); + if(OUTPUT_LENGTH) + send(output, std::min(OUTPUT_LENGTH, output.size())); + else + send(output); + } + +/************************************************* +* MAC_Filter Constructor * +*************************************************/ +MAC_Filter::MAC_Filter(const std::string& mac_name, u32bit len) : + OUTPUT_LENGTH(len) + { + base_ptr = mac = get_mac(mac_name); + } + +/************************************************* +* MAC_Filter Constructor * +*************************************************/ +MAC_Filter::MAC_Filter(const std::string& mac_name, const SymmetricKey& key, + u32bit len) : OUTPUT_LENGTH(len) + { + base_ptr = mac = get_mac(mac_name); + mac->set_key(key); + } + +/************************************************* +* Complete a calculation by a MAC_Filter * +*************************************************/ +void MAC_Filter::end_msg() + { + SecureVector output = mac->final(); + if(OUTPUT_LENGTH) + send(output, std::min(OUTPUT_LENGTH, output.size())); + else + send(output); + } + +} diff --git a/src/codec/openpgp/modinfo.txt b/src/codec/openpgp/modinfo.txt index 32a18fa4f..4fd298104 100644 --- a/src/codec/openpgp/modinfo.txt +++ b/src/codec/openpgp/modinfo.txt @@ -6,3 +6,7 @@ define OPENPGP_CODEC openpgp.cpp openpgp.h + + +base64 + diff --git a/src/codec/pem/pem.cpp b/src/codec/pem/pem.cpp new file mode 100644 index 000000000..fb0be6fd5 --- /dev/null +++ b/src/codec/pem/pem.cpp @@ -0,0 +1,141 @@ +/************************************************* +* PEM Encoding/Decoding Source File * +* (C) 1999-2007 Jack Lloyd * +*************************************************/ + +#include +#include +#include + +namespace Botan { + +namespace PEM_Code { + +/************************************************* +* PEM encode BER/DER-encoded objects * +*************************************************/ +std::string encode(const byte der[], u32bit length, const std::string& label, + u32bit width) + { + const std::string PEM_HEADER = "-----BEGIN " + label + "-----\n"; + const std::string PEM_TRAILER = "-----END " + label + "-----\n"; + + Pipe pipe(new Base64_Encoder(true, width)); + pipe.process_msg(der, length); + return (PEM_HEADER + pipe.read_all_as_string() + PEM_TRAILER); + } + +/************************************************* +* PEM encode BER/DER-encoded objects * +*************************************************/ +std::string encode(const MemoryRegion& data, const std::string& label, + u32bit width) + { + return encode(data, data.size(), label, width); + } + +/************************************************* +* Decode PEM down to raw BER/DER * +*************************************************/ +SecureVector decode_check_label(DataSource& source, + const std::string& label_want) + { + std::string label_got; + SecureVector ber = decode(source, label_got); + if(label_got != label_want) + throw Decoding_Error("PEM: Label mismatch, wanted " + label_want + + ", got " + label_got); + return ber; + } + +/************************************************* +* Decode PEM down to raw BER/DER * +*************************************************/ +SecureVector decode(DataSource& source, std::string& label) + { + const u32bit RANDOM_CHAR_LIMIT = 8; + + const std::string PEM_HEADER1 = "-----BEGIN "; + const std::string PEM_HEADER2 = "-----"; + u32bit position = 0; + + while(position != PEM_HEADER1.length()) + { + byte b; + if(!source.read_byte(b)) + throw Decoding_Error("PEM: No PEM header found"); + if(b == PEM_HEADER1[position]) + ++position; + else if(position >= RANDOM_CHAR_LIMIT) + throw Decoding_Error("PEM: Malformed PEM header"); + else + position = 0; + } + position = 0; + while(position != PEM_HEADER2.length()) + { + byte b; + if(!source.read_byte(b)) + throw Decoding_Error("PEM: No PEM header found"); + if(b == PEM_HEADER2[position]) + ++position; + else if(position) + throw Decoding_Error("PEM: Malformed PEM header"); + + if(position == 0) + label += static_cast(b); + } + + Pipe base64(new Base64_Decoder); + base64.start_msg(); + + const std::string PEM_TRAILER = "-----END " + label + "-----"; + position = 0; + while(position != PEM_TRAILER.length()) + { + byte b; + if(!source.read_byte(b)) + throw Decoding_Error("PEM: No PEM trailer found"); + if(b == PEM_TRAILER[position]) + ++position; + else if(position) + throw Decoding_Error("PEM: Malformed PEM trailer"); + + if(position == 0) + base64.write(b); + } + base64.end_msg(); + return base64.read_all(); + } + +/************************************************* +* Search for a PEM signature * +*************************************************/ +bool matches(DataSource& source, const std::string& extra, + u32bit search_range) + { + const std::string PEM_HEADER = "-----BEGIN " + extra; + + SecureVector search_buf(search_range); + u32bit got = source.peek(search_buf, search_buf.size(), 0); + + if(got < PEM_HEADER.length()) + return false; + + u32bit index = 0; + + for(u32bit j = 0; j != got; ++j) + { + if(search_buf[j] == PEM_HEADER[index]) + ++index; + else + index = 0; + if(index == PEM_HEADER.size()) + return true; + } + return false; + } + +} + +} diff --git a/src/codec/pem/pem.h b/src/codec/pem/pem.h new file mode 100644 index 000000000..e9f14ddc2 --- /dev/null +++ b/src/codec/pem/pem.h @@ -0,0 +1,33 @@ +/************************************************* +* PEM Encoding/Decoding Header File * +* (C) 1999-2007 Jack Lloyd * +*************************************************/ + +#ifndef BOTAN_PEM_H__ +#define BOTAN_PEM_H__ + +#include + +namespace Botan { + +namespace PEM_Code { + +/************************************************* +* PEM Encoding/Decoding * +*************************************************/ +BOTAN_DLL std::string encode(const byte[], u32bit, + const std::string&, u32bit = 64); +BOTAN_DLL std::string encode(const MemoryRegion&, + const std::string&, u32bit = 64); + +BOTAN_DLL SecureVector decode(DataSource&, std::string&); +BOTAN_DLL SecureVector decode_check_label(DataSource&, + const std::string&); +BOTAN_DLL bool matches(DataSource&, const std::string& = "", + u32bit search_range = 4096); + +} + +} + +#endif diff --git a/src/filters.cpp b/src/filters.cpp deleted file mode 100644 index 2c8402601..000000000 --- a/src/filters.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/************************************************* -* Filters Source File * -* (C) 1999-2007 Jack Lloyd * -*************************************************/ - -#include -#include -#include - -namespace Botan { - -/************************************************* -* StreamCipher_Filter Constructor * -*************************************************/ -StreamCipher_Filter::StreamCipher_Filter(const std::string& sc_name) : - buffer(DEFAULT_BUFFERSIZE) - { - base_ptr = cipher = get_stream_cipher(sc_name); - } - -/************************************************* -* StreamCipher_Filter Constructor * -*************************************************/ -StreamCipher_Filter::StreamCipher_Filter(const std::string& sc_name, - const SymmetricKey& key) : - buffer(DEFAULT_BUFFERSIZE) - { - base_ptr = cipher = get_stream_cipher(sc_name); - cipher->set_key(key); - } - -/************************************************* -* Set the IV of a stream cipher * -*************************************************/ -void StreamCipher_Filter::set_iv(const InitializationVector& iv) - { - cipher->resync(iv.begin(), iv.length()); - } - -/************************************************* -* Write data into a StreamCipher_Filter * -*************************************************/ -void StreamCipher_Filter::write(const byte input[], u32bit length) - { - while(length) - { - u32bit copied = std::min(length, buffer.size()); - cipher->encrypt(input, buffer, copied); - send(buffer, copied); - input += copied; - length -= copied; - } - } - -/************************************************* -* Hash_Filter Constructor * -*************************************************/ -Hash_Filter::Hash_Filter(const std::string& hash_name, u32bit len) : - OUTPUT_LENGTH(len) - { - hash = get_hash(hash_name); - } - -/************************************************* -* Complete a calculation by a Hash_Filter * -*************************************************/ -void Hash_Filter::end_msg() - { - SecureVector output = hash->final(); - if(OUTPUT_LENGTH) - send(output, std::min(OUTPUT_LENGTH, output.size())); - else - send(output); - } - -/************************************************* -* MAC_Filter Constructor * -*************************************************/ -MAC_Filter::MAC_Filter(const std::string& mac_name, u32bit len) : - OUTPUT_LENGTH(len) - { - base_ptr = mac = get_mac(mac_name); - } - -/************************************************* -* MAC_Filter Constructor * -*************************************************/ -MAC_Filter::MAC_Filter(const std::string& mac_name, const SymmetricKey& key, - u32bit len) : OUTPUT_LENGTH(len) - { - base_ptr = mac = get_mac(mac_name); - mac->set_key(key); - } - -/************************************************* -* Complete a calculation by a MAC_Filter * -*************************************************/ -void MAC_Filter::end_msg() - { - SecureVector output = mac->final(); - if(OUTPUT_LENGTH) - send(output, std::min(OUTPUT_LENGTH, output.size())); - else - send(output); - } - -} diff --git a/src/pem.cpp b/src/pem.cpp deleted file mode 100644 index fb0be6fd5..000000000 --- a/src/pem.cpp +++ /dev/null @@ -1,141 +0,0 @@ -/************************************************* -* PEM Encoding/Decoding Source File * -* (C) 1999-2007 Jack Lloyd * -*************************************************/ - -#include -#include -#include - -namespace Botan { - -namespace PEM_Code { - -/************************************************* -* PEM encode BER/DER-encoded objects * -*************************************************/ -std::string encode(const byte der[], u32bit length, const std::string& label, - u32bit width) - { - const std::string PEM_HEADER = "-----BEGIN " + label + "-----\n"; - const std::string PEM_TRAILER = "-----END " + label + "-----\n"; - - Pipe pipe(new Base64_Encoder(true, width)); - pipe.process_msg(der, length); - return (PEM_HEADER + pipe.read_all_as_string() + PEM_TRAILER); - } - -/************************************************* -* PEM encode BER/DER-encoded objects * -*************************************************/ -std::string encode(const MemoryRegion& data, const std::string& label, - u32bit width) - { - return encode(data, data.size(), label, width); - } - -/************************************************* -* Decode PEM down to raw BER/DER * -*************************************************/ -SecureVector decode_check_label(DataSource& source, - const std::string& label_want) - { - std::string label_got; - SecureVector ber = decode(source, label_got); - if(label_got != label_want) - throw Decoding_Error("PEM: Label mismatch, wanted " + label_want + - ", got " + label_got); - return ber; - } - -/************************************************* -* Decode PEM down to raw BER/DER * -*************************************************/ -SecureVector decode(DataSource& source, std::string& label) - { - const u32bit RANDOM_CHAR_LIMIT = 8; - - const std::string PEM_HEADER1 = "-----BEGIN "; - const std::string PEM_HEADER2 = "-----"; - u32bit position = 0; - - while(position != PEM_HEADER1.length()) - { - byte b; - if(!source.read_byte(b)) - throw Decoding_Error("PEM: No PEM header found"); - if(b == PEM_HEADER1[position]) - ++position; - else if(position >= RANDOM_CHAR_LIMIT) - throw Decoding_Error("PEM: Malformed PEM header"); - else - position = 0; - } - position = 0; - while(position != PEM_HEADER2.length()) - { - byte b; - if(!source.read_byte(b)) - throw Decoding_Error("PEM: No PEM header found"); - if(b == PEM_HEADER2[position]) - ++position; - else if(position) - throw Decoding_Error("PEM: Malformed PEM header"); - - if(position == 0) - label += static_cast(b); - } - - Pipe base64(new Base64_Decoder); - base64.start_msg(); - - const std::string PEM_TRAILER = "-----END " + label + "-----"; - position = 0; - while(position != PEM_TRAILER.length()) - { - byte b; - if(!source.read_byte(b)) - throw Decoding_Error("PEM: No PEM trailer found"); - if(b == PEM_TRAILER[position]) - ++position; - else if(position) - throw Decoding_Error("PEM: Malformed PEM trailer"); - - if(position == 0) - base64.write(b); - } - base64.end_msg(); - return base64.read_all(); - } - -/************************************************* -* Search for a PEM signature * -*************************************************/ -bool matches(DataSource& source, const std::string& extra, - u32bit search_range) - { - const std::string PEM_HEADER = "-----BEGIN " + extra; - - SecureVector search_buf(search_range); - u32bit got = source.peek(search_buf, search_buf.size(), 0); - - if(got < PEM_HEADER.length()) - return false; - - u32bit index = 0; - - for(u32bit j = 0; j != got; ++j) - { - if(search_buf[j] == PEM_HEADER[index]) - ++index; - else - index = 0; - if(index == PEM_HEADER.size()) - return true; - } - return false; - } - -} - -} -- cgit v1.2.3