     (.init kdfimpl params)
     (reify
       IKDF
-      (generate-byte-array! [_ length]
-        (generate-byte-array kdfimpl length))
+      (generate-byte-array [_ length]
+        (generate-byte-array* kdfimpl length))
 
-      (generate-byte-buffer! [_ length]
-        (generate-byte-buffer kdfimpl length)))))
+      (generate-byte-buffer [_ length]
+        (generate-byte-buffer* kdfimpl length)))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Feedback mode KDF

    (.init kdfimpl params)
    (reify
      IKDF
      (generate-byte-array! [_ length]
        (generate-byte-array kdfimpl length))

      (generate-byte-buffer! [_ length]
        (generate-byte-buffer kdfimpl length)))))

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Feedback mode KDF

    (.init kdfimpl params)
    (reify
      IKDF
      (generate-byte-array [_ length]
        (generate-byte-array* kdfimpl length))

      (generate-byte-buffer [_ length]
        (generate-byte-buffer* kdfimpl length)))))
