diff --git a/bench1.cpp b/bench1.cpp
index 04f3745f..56317c6b 100644
--- a/bench1.cpp
+++ b/bench1.cpp
@@ -200,6 +200,16 @@ void BenchMark(const char *name, RandomNumberGenerator &rng, double timeTotal)
 	Test::GlobalRNG().GenerateBlock(buf, BUF_SIZE);
 	buf.SetMark(16);
 
+	SymmetricCipher * cipher = dynamic_cast<SymmetricCipher*>(&rng);
+	if (cipher != NULLPTR)
+	{
+		const size_t size = cipher->DefaultKeyLength();
+		if (cipher->IsResynchronizable())
+			cipher->SetKeyWithIV(buf, size, buf+size);
+		else
+			cipher->SetKey(buf, size);
+	}
+
 	unsigned long long blocks = 1;
 	double timeTaken;
 
@@ -406,6 +416,7 @@ void Benchmark1(double t, double hertz)
 		if (HasRDSEED())
 			BenchMarkByNameKeyLess<RandomNumberGenerator>("RDSEED");
 #endif
+		BenchMarkByNameKeyLess<RandomNumberGenerator>("AES/OFB RNG");
 		BenchMarkByNameKeyLess<NIST_DRBG>("Hash_DRBG(SHA1)");
 		BenchMarkByNameKeyLess<NIST_DRBG>("Hash_DRBG(SHA256)");
 		BenchMarkByNameKeyLess<NIST_DRBG>("HMAC_DRBG(SHA1)");
diff --git a/regtest.cpp b/regtest.cpp
index 4c81a554..704bc2e0 100644
--- a/regtest.cpp
+++ b/regtest.cpp
@@ -210,6 +210,7 @@ void RegisterFactories()
 	if (HasRDSEED())
 		RegisterDefaultFactoryFor<RandomNumberGenerator, RDSEED>();
 #endif
+	RegisterDefaultFactoryFor<RandomNumberGenerator, OFB_Mode<AES>::Encryption >("AES/OFB RNG");
 	RegisterDefaultFactoryFor<NIST_DRBG, Hash_DRBG<SHA1> >("Hash_DRBG(SHA1)");
 	RegisterDefaultFactoryFor<NIST_DRBG, Hash_DRBG<SHA256> >("Hash_DRBG(SHA256)");
 	RegisterDefaultFactoryFor<NIST_DRBG, HMAC_DRBG<SHA1> >("HMAC_DRBG(SHA1)");