diff options
| author | Steffan Karger <steffan@karger.me> | 2014-05-25 21:18:19 +0200 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2014-05-26 18:25:59 +0200 |
| commit | bb669e502596ccb52972d64acf964286f67f0e86 (patch) | |
| tree | 887329577986e916078fdcfab64a4bf4dea8fbe6 /src | |
| parent | a6c573d22566a1dfc44ab060687192a4debc2e03 (diff) | |
| download | openvpn-bb669e502596ccb52972d64acf964286f67f0e86.tar.gz openvpn-bb669e502596ccb52972d64acf964286f67f0e86.tar.xz openvpn-bb669e502596ccb52972d64acf964286f67f0e86.zip | |
Remove function without effect (cipher_ok() always returned true).
Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1401045501-12343-2-git-send-email-steffan@karger.me>
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src')
| -rw-r--r-- | src/openvpn/crypto_openssl.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index 6199e61..f471eee 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -69,12 +69,6 @@ EVP_CipherUpdate_ov (EVP_CIPHER_CTX *ctx, uint8_t *out, int *outl, uint8_t *in, return EVP_CipherUpdate (ctx, out, outl, in, inl); } -static inline bool -cipher_ok (const char* name) -{ - return true; -} - #ifndef EVP_CIPHER_name #define EVP_CIPHER_name(e) OBJ_nid2sn(EVP_CIPHER_nid(e)) #endif @@ -285,7 +279,7 @@ show_available_ciphers () for (nid = 0; nid < 10000; ++nid) /* is there a better way to get the size of the nid list? */ { const EVP_CIPHER *cipher = EVP_get_cipherbynid (nid); - if (cipher && cipher_ok (OBJ_nid2sn (nid))) + if (cipher) { const unsigned int mode = EVP_CIPHER_mode (cipher); if (mode == EVP_CIPH_CBC_MODE @@ -464,7 +458,7 @@ cipher_kt_get (const char *ciphername) cipher = EVP_get_cipherbyname (ciphername); - if ((NULL == cipher) || !cipher_ok (OBJ_nid2sn (EVP_CIPHER_nid (cipher)))) + if (NULL == cipher) msg (M_SSLERR, "Cipher algorithm '%s' not found", ciphername); if (EVP_CIPHER_key_length (cipher) > MAX_CIPHER_KEY_LENGTH) |