Kill off the quite vestigal pubkey_enums header. Move most of the code

to key_constraints.{h,cpp} in cert/x509. Move the X509_Encoding enum
to x509_key.h

Constify argument to X509_Object::check_signature, accidental ommision

1 files changed, 5 insertions, 13 deletions

diff --git a/src/pubkey/x509_key.h b/src/pubkey/x509_key.h
index 3fdee8cde..13ad7e635 100644
--- a/src/pubkey/x509_key.h
+++ b/src/pubkey/x509_key.h
@@ -10,13 +10,17 @@
 
 #include <botan/pk_keys.h>
 #include <botan/alg_id.h>
-#include <botan/pubkey_enums.h>
 #include <botan/pipe.h>
 #include <string>
 
 namespace Botan {
 
 /**
+* The two types of X509 encoding supported by Botan.
+*/
+enum X509_Encoding { RAW_BER, PEM };
+
+/**
 * This namespace contains functions for handling X.509 public keys
 */
 namespace X509 {
@@ -64,18 +68,6 @@ BOTAN_DLL Public_Key* load_key(const MemoryRegion<byte>& enc);
 BOTAN_DLL Public_Key* copy_key(const Public_Key& key);
 
 /**
-* Create the key constraints for a specific public key.
-* @param pub_key the public key from which the basic set of
-* constraints to be placed in the return value is derived
-* @param limits additional limits that will be incorporated into the
-* return value
-* @return combination of key type specific constraints and
-* additional limits
-*/
-BOTAN_DLL Key_Constraints find_constraints(const Public_Key& pub_key,
-                                           Key_Constraints limits);
-
-/**
 * Encode a key into a pipe.
 * @deprecated Use PEM_encode or BER_encode instead
 *