misc changes

1 files changed, 5 insertions, 6 deletions

diff --git a/rsa.cpp b/rsa.cpp
index 1e00a6cf..eb68a67f 100644
--- a/rsa.cpp
+++ b/rsa.cpp
@@ -12,11 +12,7 @@
 
 #if !defined(NDEBUG) && !defined(CRYPTOPP_IS_DLL)
 #include "pssr.h"
-#endif
-
 NAMESPACE_BEGIN(CryptoPP)
-
-#if !defined(NDEBUG) && !defined(CRYPTOPP_IS_DLL)
 void RSA_TestInstantiations()
 {
 	RSASS<PKCS1v15, SHA>::Verifier x1(1, 1);
@@ -37,10 +33,13 @@ void RSA_TestInstantiations()
 
 	x4 = x2.GetKey();
 }
+NAMESPACE_END
 #endif
 
 #ifndef CRYPTOPP_IMPORTS
 
+NAMESPACE_BEGIN(CryptoPP)
+
 OID RSAFunction::GetAlgorithmID() const
 {
 	return ASN1::rsaEncryption();
@@ -276,6 +275,6 @@ void InvertibleRSAFunction::AssignFrom(const NameValuePairs &source)
 		;
 }
 
-#endif
-
 NAMESPACE_END
+
+#endif