Drop some deprecated functions

2 files changed, 0 insertions, 20 deletions

diff --git a/src/cert/x509/x509_obj.cpp b/src/cert/x509/x509_obj.cpp
index ff116d894..37d814ce6 100644
--- a/src/cert/x509/x509_obj.cpp
+++ b/src/cert/x509/x509_obj.cpp
@@ -109,17 +109,6 @@ void X509_Object::decode_from(BER_Decoder& from)
    }
 
 /*
-* Return a BER or PEM encoded X.509 object
-*/
-void X509_Object::encode(Pipe& out, X509_Encoding encoding) const
-   {
-   if(encoding == PEM)
-      out.write(this->PEM_encode());
-   else
-      out.write(this->BER_encode());
-   }
-
-/*
 * Return a BER encoded X.509 object
 */
 std::vector<byte> X509_Object::BER_encode() const
diff --git a/src/cert/x509/x509_obj.h b/src/cert/x509/x509_obj.h
index 75a0b5c02..5905e1b37 100644
--- a/src/cert/x509/x509_obj.h
+++ b/src/cert/x509/x509_obj.h
@@ -86,15 +86,6 @@ class BOTAN_DLL X509_Object : public ASN1_Object
       */
       std::string PEM_encode() const;
 
-      /**
-      * Encode this to a pipe
-      * @deprecated use BER_encode or PEM_encode instead
-      * @param out the pipe to write to
-      * @param encoding the encoding to use
-      */
-      BOTAN_DEPRECATED("Use BER_encode or PEM_encode")
-      void encode(Pipe& out, X509_Encoding encoding = PEM) const;
-
       virtual ~X509_Object() {}
    protected:
       X509_Object(DataSource& src, const std::string& pem_labels);