diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/includes/gnutls/x509.h | 2 | ||||
| -rw-r--r-- | lib/x509/privkey.c | 2 | ||||
| -rw-r--r-- | lib/x509/privkey_openssl.c | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h index a1947ffcb0..5923aca72a 100644 --- a/lib/includes/gnutls/x509.h +++ b/lib/includes/gnutls/x509.h @@ -719,7 +719,7 @@ extern "C" const char *password, unsigned int flags); int gnutls_x509_privkey_import_openssl (gnutls_x509_privkey_t key, - const gnutls_datum_t *data, gnutls_x509_crt_fmt_t format, + const gnutls_datum_t *data, const char* password); int gnutls_x509_privkey_import2 (gnutls_x509_privkey_t key, diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index 8c68ef2284..26e1332748 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -608,7 +608,7 @@ gnutls_x509_privkey_import2 (gnutls_x509_privkey_t key, if (format == GNUTLS_X509_FMT_PEM) { int err; - err = gnutls_x509_privkey_import_openssl(key, data, format, password); + err = gnutls_x509_privkey_import_openssl(key, data, password); if (err < 0) { if (err == GNUTLS_E_DECRYPTION_FAILED) ret = err; diff --git a/lib/x509/privkey_openssl.c b/lib/x509/privkey_openssl.c index 63a930e7e7..6ef1410caa 100644 --- a/lib/x509/privkey_openssl.c +++ b/lib/x509/privkey_openssl.c @@ -105,7 +105,6 @@ static const struct pem_cipher { * gnutls_x509_privkey_import_openssl: * @key: The structure to store the parsed key * @data: The DER or PEM encoded key. - * @format: Only PEM is supported * @password: the password to decrypt the key (if it is encrypted). * * This function will convert the given PEM encrypted to @@ -122,7 +121,7 @@ static const struct pem_cipher { **/ int gnutls_x509_privkey_import_openssl (gnutls_x509_privkey_t key, - const gnutls_datum_t *data, gnutls_x509_crt_fmt_t format, const char* password) + const gnutls_datum_t *data, const char* password) { gnutls_cipher_hd_t handle; gnutls_cipher_algorithm_t cipher = GNUTLS_CIPHER_UNKNOWN; |