Move RC4 + SOBER128 to src/stream/

testprof/cipher_hash_test.c

@@ -14,10 +14,16 @@ int cipher_hash_test(void)
       DOX(cipher_descriptor[x].test(), cipher_descriptor[x].name);
    }
 
-#ifdef LTC_CHACHA
-   /* ChaCha is a special case (stream cipher) */
+   /* stream ciphers */
+#ifdef LTC_CHACHA_STREAM
    DO(chacha_test());
 #endif
+#ifdef LTC_RC4_STREAM
+   DO(rc4_test());
+#endif
+#ifdef LTC_SOBER128_STREAM
+   DO(sober128_test());
+#endif
 
    /* test hashes */
    for (x = 0; hash_descriptor[x].name != NULL; x++) {

testprof/x86_prof.c

@@ -342,7 +342,7 @@ static void _unregister_all(void)
 #ifdef LTC_RC4
   unregister_prng(&rc4_desc);
 #endif
-#ifdef LTC_CHACHA
+#ifdef LTC_CHACHA_PRNG
   unregister_prng(&chacha20_prng_desc);
 #endif
 #ifdef LTC_SOBER128
@@ -524,7 +524,7 @@ register_prng(&fortuna_desc);
 #ifdef LTC_RC4
 register_prng(&rc4_desc);
 #endif
-#ifdef LTC_CHACHA
+#ifdef LTC_CHACHA_PRNG
 register_prng(&chacha20_prng_desc);
 #endif
 #ifdef LTC_SOBER128