fix documentation, fix PanamaMAC, fix algorithm names

1 files changed, 7 insertions, 9 deletions

diff --git a/arc4.h b/arc4.h
index 0072a78a..73260394 100644
--- a/arc4.h
+++ b/arc4.h
@@ -5,9 +5,8 @@
 
 NAMESPACE_BEGIN(CryptoPP)
 
-//! <a href="http://www.weidai.com/scan-mirror/cs.html#RC4">Alleged RC4</a>
-/*! Use #ARC4 typedef rather than this class directly. */
-class CRYPTOPP_NO_VTABLE ARC4_Base : public VariableKeyLength<16, 1, 256>, public RandomNumberGenerator, public SymmetricCipher
+//! _
+class CRYPTOPP_NO_VTABLE ARC4_Base : public VariableKeyLength<16, 1, 256>, public RandomNumberGenerator, public SymmetricCipher, public SymmetricCipherDocumentation
 {
 public:
 	~ARC4_Base();
@@ -34,11 +33,10 @@ protected:
     byte m_x, m_y;
 };
 
-//! .
-typedef SymmetricCipherFinal<ARC4_Base> ARC4;
+//! <a href="http://www.weidai.com/scan-mirror/cs.html#RC4">Alleged RC4</a>
+DOCUMENTED_TYPEDEF(SymmetricCipherFinal<ARC4_Base>, ARC4)
 
-//! Modified ARC4: it discards the first 256 bytes of keystream which may be weaker than the rest
-/*! Use #MARC4 typedef rather than this class directly. */
+//! _
 class CRYPTOPP_NO_VTABLE MARC4_Base : public ARC4_Base
 {
 public:
@@ -51,8 +49,8 @@ protected:
 	unsigned int GetDefaultDiscardBytes() const {return 256;}
 };
 
-//! .
-typedef SymmetricCipherFinal<MARC4_Base> MARC4;
+//! Modified ARC4: it discards the first 256 bytes of keystream which may be weaker than the rest
+DOCUMENTED_TYPEDEF(SymmetricCipherFinal<MARC4_Base>, MARC4)
 
 NAMESPACE_END