diff options
| author | Frank de Brabander <brabander@fox-it.com> | 2012-02-16 13:51:04 +0100 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-02-16 15:13:21 +0100 |
| commit | 6449a149f850e9e1207233f3ca642d9342fbfbaf (patch) | |
| tree | 5034db4ffb2e0cbd66a417bbbc3914918de24cc7 | |
| parent | 86e8754cd83d6c91a1ead344aea8c0ee131a9f26 (diff) | |
| download | openvpn-6449a149f850e9e1207233f3ca642d9342fbfbaf.tar.gz openvpn-6449a149f850e9e1207233f3ca642d9342fbfbaf.tar.xz openvpn-6449a149f850e9e1207233f3ca642d9342fbfbaf.zip | |
Fixed wrong return type of cipher_kt_mode
The cipher_kt_mode uses bool as return type, this should be int. On
some platforms like OS X, any returned value larger than one will
be converted to 1.
Signed-off-by: Frank de Brabander <brabander@fox-it.com>
Acked-by: Adriaan de Jong <dejong@fox-it.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
| -rw-r--r-- | crypto_backend.h | 2 | ||||
| -rw-r--r-- | crypto_openssl.c | 2 | ||||
| -rw-r--r-- | crypto_polarssl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto_backend.h b/crypto_backend.h index 8622962..a0966dd 100644 --- a/crypto_backend.h +++ b/crypto_backend.h @@ -218,7 +218,7 @@ int cipher_kt_block_size (const cipher_kt_t *cipher_kt); * @return Cipher mode, either \c OPENVPN_MODE_CBC, \c * OPENVPN_MODE_OFB or \c OPENVPN_MODE_CFB */ -bool cipher_kt_mode (const cipher_kt_t *cipher_kt); +int cipher_kt_mode (const cipher_kt_t *cipher_kt); /** diff --git a/crypto_openssl.c b/crypto_openssl.c index db6b78e..0a41b39 100644 --- a/crypto_openssl.c +++ b/crypto_openssl.c @@ -555,7 +555,7 @@ cipher_kt_block_size (const EVP_CIPHER *cipher_kt) return EVP_CIPHER_block_size (cipher_kt); } -bool +int cipher_kt_mode (const EVP_CIPHER *cipher_kt) { ASSERT(NULL != cipher_kt); diff --git a/crypto_polarssl.c b/crypto_polarssl.c index e7470d5..ac4cadd 100644 --- a/crypto_polarssl.c +++ b/crypto_polarssl.c @@ -313,7 +313,7 @@ cipher_kt_block_size (const cipher_info_t *cipher_kt) return cipher_kt->block_size; } -bool +int cipher_kt_mode (const cipher_info_t *cipher_kt) { ASSERT(NULL != cipher_kt); |