diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-07-08 13:13:40 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-07-08 13:13:40 +0200 |
| commit | 1c218b507acfc62d6af742bac192113fef119284 (patch) | |
| tree | 6a79e0472879cd98075a9db81b5069ae1763ff50 /lib/x509/privkey.c | |
| parent | 54c1e5d81ec42547b1c8d15e50d7263497089d07 (diff) | |
| download | gnutls-1c218b507acfc62d6af742bac192113fef119284.tar.gz | |
simplified base64 encoding/decoding functions by using a datum.
Diffstat (limited to 'lib/x509/privkey.c')
| -rw-r--r-- | lib/x509/privkey.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c index 26e1332748..9d32025db0 100644 --- a/lib/x509/privkey.c +++ b/lib/x509/privkey.c @@ -451,11 +451,9 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key, */ if (format == GNUTLS_X509_FMT_PEM) { - uint8_t *out; - /* Try the first header */ result = - _gnutls_fbase64_decode (PEM_KEY_RSA, data->data, data->size, &out); + _gnutls_fbase64_decode (PEM_KEY_RSA, data->data, data->size, &_data); if (result >= 0) key->pk_algorithm = GNUTLS_PK_RSA; @@ -465,7 +463,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key, /* try for the second header */ result = _gnutls_fbase64_decode (PEM_KEY_DSA, data->data, data->size, - &out); + &_data); if (result >= 0) key->pk_algorithm = GNUTLS_PK_DSA; @@ -475,7 +473,7 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key, /* try for the second header */ result = _gnutls_fbase64_decode (PEM_KEY_ECC, data->data, data->size, - &out); + &_data); if (result >= 0) key->pk_algorithm = GNUTLS_PK_EC; } @@ -487,9 +485,6 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key, goto failover; } - _data.data = out; - _data.size = result; - need_free = 1; } |