Shuffle things around. Add NIST X.509 test to build.

3 files changed, 0 insertions, 243 deletions

diff --git a/src/codec/pem/info.txt b/src/codec/pem/info.txt
deleted file mode 100644
index 74b90eef4..000000000
--- a/src/codec/pem/info.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-define PEM_CODEC 20131128
-
-<requires>
-base64
-codec_filt
-</requires>
diff --git a/src/codec/pem/pem.cpp b/src/codec/pem/pem.cpp
deleted file mode 100644
index 03ec33440..000000000
--- a/src/codec/pem/pem.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-* PEM Encoding/Decoding
-* (C) 1999-2007 Jack Lloyd
-*
-* Distributed under the terms of the Botan license
-*/
-
-#include <botan/pem.h>
-#include <botan/filters.h>
-#include <botan/parsing.h>
-
-namespace Botan {
-
-namespace PEM_Code {
-
-/*
-* PEM encode BER/DER-encoded objects
-*/
-std::string encode(const byte der[], size_t length, const std::string& label,
-                   size_t 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);
-   }
-
-/*
-* Decode PEM down to raw BER/DER
-*/
-secure_vector<byte> decode_check_label(DataSource& source,
-                                      const std::string& label_want)
-   {
-   std::string label_got;
-   secure_vector<byte> 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
-*/
-secure_vector<byte> decode(DataSource& source, std::string& label)
-   {
-   const size_t RANDOM_CHAR_LIMIT = 8;
-
-   const std::string PEM_HEADER1 = "-----BEGIN ";
-   const std::string PEM_HEADER2 = "-----";
-   size_t 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<char>(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();
-   }
-
-secure_vector<byte> decode_check_label(const std::string& pem,
-                                      const std::string& label_want)
-   {
-   DataSource_Memory src(pem);
-   return decode_check_label(src, label_want);
-   }
-
-secure_vector<byte> decode(const std::string& pem, std::string& label)
-   {
-   DataSource_Memory src(pem);
-   return decode(src, label);
-   }
-
-/*
-* Search for a PEM signature
-*/
-bool matches(DataSource& source, const std::string& extra,
-             size_t search_range)
-   {
-   const std::string PEM_HEADER = "-----BEGIN " + extra;
-
-   secure_vector<byte> search_buf(search_range);
-   size_t got = source.peek(&search_buf[0], search_buf.size(), 0);
-
-   if(got < PEM_HEADER.length())
-      return false;
-
-   size_t index = 0;
-
-   for(size_t 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
deleted file mode 100644
index a0c6f74aa..000000000
--- a/src/codec/pem/pem.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-* PEM Encoding/Decoding
-* (C) 1999-2007 Jack Lloyd
-*
-* Distributed under the terms of the Botan license
-*/
-
-#ifndef BOTAN_PEM_H__
-#define BOTAN_PEM_H__
-
-#include <botan/data_src.h>
-
-namespace Botan {
-
-namespace PEM_Code {
-
-/**
-* Encode some binary data in PEM format
-*/
-BOTAN_DLL std::string encode(const byte data[],
-                             size_t data_len,
-                             const std::string& label,
-                             size_t line_width = 64);
-
-/**
-* Encode some binary data in PEM format
-*/
-inline std::string encode(const std::vector<byte>& data,
-                          const std::string& label,
-                          size_t line_width = 64)
-   {
-   return encode(&data[0], data.size(), label, line_width);
-   }
-
-/**
-* Encode some binary data in PEM format
-*/
-inline std::string encode(const secure_vector<byte>& data,
-                          const std::string& label,
-                          size_t line_width = 64)
-   {
-   return encode(&data[0], data.size(), label, line_width);
-   }
-
-/**
-* Decode PEM data
-* @param pem a datasource containing PEM encoded data
-* @param label is set to the PEM label found for later inspection
-*/
-BOTAN_DLL secure_vector<byte> decode(DataSource& pem,
-                                     std::string& label);
-
-/**
-* Decode PEM data
-* @param pem a string containing PEM encoded data
-* @param label is set to the PEM label found for later inspection
-*/
-BOTAN_DLL secure_vector<byte> decode(const std::string& pem,
-                                     std::string& label);
-
-/**
-* Decode PEM data
-* @param pem a datasource containing PEM encoded data
-* @param label is what we expect the label to be
-*/
-BOTAN_DLL secure_vector<byte> decode_check_label(
-   DataSource& pem,
-   const std::string& label);
-
-/**
-* Decode PEM data
-* @param pem a string containing PEM encoded data
-* @param label is what we expect the label to be
-*/
-BOTAN_DLL secure_vector<byte> decode_check_label(
-   const std::string& pem,
-   const std::string& label);
-
-/**
-* Heuristic test for PEM data.
-*/
-BOTAN_DLL bool matches(DataSource& source,
-                       const std::string& extra = "",
-                       size_t search_range = 4096);
-
-}
-
-}
-
-#endif