Make various member functions in the PK algorithms public, particularly

ones which were visible via base classes, and the empty constructors.

1 files changed, 8 insertions, 9 deletions

diff --git a/include/nr.h b/include/nr.h
index a71d29f9f..490ae153c 100644
--- a/include/nr.h
+++ b/include/nr.h
@@ -18,20 +18,20 @@ class NR_PublicKey : public PK_Verifying_with_MR_Key,
                      public virtual DL_Scheme_PublicKey
    {
    public:
+      std::string algo_name() const { return "NR"; }
+
       SecureVector<byte> verify(const byte[], u32bit) const;
       u32bit max_input_bits() const;
 
+      DL_Group::Format group_format() const { return DL_Group::ANSI_X9_57; }
+      u32bit message_parts() const { return 2; }
+      u32bit message_part_size() const;
+
+      NR_PublicKey() {}
       NR_PublicKey(const DL_Group&, const BigInt&);
    protected:
-      std::string algo_name() const { return "NR"; }
-      NR_PublicKey() {}
-
       NR_Core core;
    private:
-      friend Public_Key* get_public_key(const std::string&);
-      DL_Group::Format group_format() const { return DL_Group::ANSI_X9_57; }
-      u32bit message_parts() const { return 2; }
-      u32bit message_part_size() const;
       void X509_load_hook();
    };
 
@@ -47,12 +47,11 @@ class NR_PrivateKey : public NR_PublicKey,
 
       bool check_key(bool) const;
 
+      NR_PrivateKey() {}
       NR_PrivateKey(const DL_Group&);
       NR_PrivateKey(const DL_Group&, const BigInt&, const BigInt& = 0);
    private:
-      friend Private_Key* get_private_key(const std::string&);
       void PKCS8_load_hook(bool = false);
-      NR_PrivateKey() {}
    };
 
 }