Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-10-02' into staging

[qemu.git] / crypto / cipherpriv.h

diff --git a/crypto/cipherpriv.h b/crypto/cipherpriv.h
index 77da4c2f321ea3fb4b70cdd2963ceb3ec02e2a9c..396527857d686ba0225547f5fa6bffaa673f7f95 100644 (file)
--- a/crypto/cipherpriv.h
+++ b/crypto/cipherpriv.h
@@ -15,9 +15,7 @@
 #ifndef QCRYPTO_CIPHERPRIV_H
 #define QCRYPTO_CIPHERPRIV_H
 
-#include "qapi-types.h"
-
-typedef struct QCryptoCipherDriver QCryptoCipherDriver;
+#include "qapi/qapi-types-crypto.h"
 
 struct QCryptoCipherDriver {
     int (*cipher_encrypt)(QCryptoCipher *cipher,
@@ -43,14 +41,12 @@ struct QCryptoCipherDriver {
 
 #include "afalgpriv.h"
 
-extern QCryptoAFAlg *
+extern QCryptoCipher *
 qcrypto_afalg_cipher_ctx_new(QCryptoCipherAlgorithm alg,
                              QCryptoCipherMode mode,
                              const uint8_t *key,
                              size_t nkey, Error **errp);
 
-extern struct QCryptoCipherDriver qcrypto_cipher_afalg_driver;
-
 #endif
 
 #endif