This resolves bug 2713
The MAGIC_CONTINUE flag resulted in a malformed mimemagic responses
like "application/x-executable\012- application/octet-stream"
instead of just "application/x-executable".
This string being unparsed then caused the KMimeType::findByURL() to
fallback to application/octet-stream for nearly every mimetype.
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
(cherry picked from commit f54496a1f2)
Some KOpenSSLProxy methods have been renamed to be consistent
with OpenSSL 1.1 API names and to prevent hidden API changes.
To ensure API / ABI compatibility, the original methods are
still included but have been marked as deprecated.
+ SSLv23_client_method => TLS_client_method
+ X509_STORE_CTX_set_chain => X509_STORE_CTX_set0_untrusted
+ sk_dup => OPENSSL_sk_dup
+ sk_free => OPENSSL_sk_free
+ sk_new => OPENSSL_sk_new
+ sk_num => OPENSSL_sk_num
+ sk_pop => OPENSSL_sk_pop
+ sk_push => OPENSSL_sk_push
+ sk_value => OPENSSL_sk_value
Additional methods have been added to KOpenSSLProxy to support
the new OpenSSL 1.1 API functions that provide access to the
(now) opaque SSL structures. Compatibility with OpenSSL < 1.1
is handled internally in KOpenSSLProxy.
+ BIO_get_data
+ DSA_get0_key
+ DSA_get0_pqg
+ EVP_PKEY_base_id
+ EVP_PKEY_get0_DSA
+ EVP_PKEY_get0_RSA
+ RSA_get0_key
+ X509_CRL_get0_lastUpdate
+ X509_CRL_get0_nextUpdate
+ X509_OBJECT_get0_X509
+ X509_OBJECT_get_type
+ X509_STORE_CTX_get_current_cert
+ X509_STORE_CTX_get_error
+ X509_STORE_CTX_get_error_depth
+ X509_STORE_CTX_set_error
+ X509_STORE_get0_objects
+ X509_STORE_set_verify_cb
+ X509_get0_signature
+ X509_getm_notAfter
+ X509_getm_notBefore
+ X509_subject_name_cmp
+ _SSL_session_reused
+ _SSL_set_options
Method "KSSL::setSession" has been renamed to "KSSL::takeSession"
and its functionality has changed: the session is now transferred
from the argument object to the invoked object. Since it is only
used internally in TDE and the functionality is different, the
method with the previous name has not been preserved.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e1861cb681)
- if the user types a new path manually, the new location was not used. Instead the older path was taken.
In case the typed path does not exists, an error message is displayed
- if the user selected a path from the autocompletion lists using the mouse, the new selected location was
not used when slotOK was invoked.
This resolves bug 2654.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 53e36f6db0)
Signed-off-by: Emanoil Kotsev <deloptes@gmail.com>
Removed not-required part of the patch from original Emanoil's patch (empty spaces at the end of line)
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 13e032939e)
This was a regression introduced in commit 5117798 three years ago.
After reverting the related part, I have tested at length and not found any problem,
so it seems safe enough to push the old code back.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit dfd961b2b9)