lib-dcrypt: make decrypt_istream format and flags visible

diff --git a/src/lib-dcrypt/istream-decrypt.c b/src/lib-dcrypt/istream-decrypt.c
index 0924fa54087d8add0bfe41e644e5b7f468edd589..3f60d9c7f32ce6e4c1d58a559f9f068fad4d1759 100644 (file)
--- a/src/lib-dcrypt/istream-decrypt.c
+++ b/src/lib-dcrypt/istream-decrypt.c
@@ -36,12 +36,19 @@ struct decrypt_istream {
        struct dcrypt_context_symmetric *ctx_sym;
        struct dcrypt_context_hmac *ctx_mac;
 
-       enum {
-               DECRYPT_FORMAT_V1,
-               DECRYPT_FORMAT_V2
-       } format;
+       enum decrypt_istream_format format;
 };
 
+enum decrypt_istream_format i_stream_encrypt_get_format(const struct istream *input)
+{
+       return ((const struct decrypt_istream*)input->real_stream)->format;
+}
+
+enum io_stream_encrypt_flags i_stream_encrypt_get_flags(const struct istream *input)
+{
+       return ((const struct decrypt_istream*)input->real_stream)->flags;
+}
+
 static
 ssize_t i_stream_decrypt_read_header_v1(struct decrypt_istream *stream,
        const unsigned char *data, size_t mlen)

diff --git a/src/lib-dcrypt/istream-decrypt.h b/src/lib-dcrypt/istream-decrypt.h
index 0c59bc8ee8208489dcd1e75d86c0d906e0b9fbd0..34a22290ac4e935cec0e86b3a49b4db6ccde8f11 100644 (file)
--- a/src/lib-dcrypt/istream-decrypt.h
+++ b/src/lib-dcrypt/istream-decrypt.h
@@ -4,6 +4,11 @@
 struct dcrypt_private_key;
 struct dcrypt_context_symmetric;
 
+enum decrypt_istream_format {
+       DECRYPT_FORMAT_V1,
+       DECRYPT_FORMAT_V2
+};
+
 /* Look for a private key for a specified public key digest and set it to
    priv_key_r. Returns 1 if ok, 0 if key doesn't exist, -1 on internal error. */
 typedef int
@@ -27,4 +32,8 @@ struct istream *
 i_stream_create_decrypt_callback(struct istream *input,
                                 i_stream_decrypt_get_key_callback_t *callback,
                                 void *context);
+
+enum decrypt_istream_format i_stream_encrypt_get_format(const struct istream *input);
+enum io_stream_encrypt_flags i_stream_encrypt_get_flags(const struct istream *input);
+
 #endif