diff options
author | Dan Williams <dcbw@redhat.com> | 2009-02-02 01:03:15 -0500 |
---|---|---|
committer | Dan Williams <dcbw@redhat.com> | 2009-02-02 01:03:15 -0500 |
commit | 203cff4d834510408c3ae312bbbc4ce2157d82c0 (patch) | |
tree | 887e208787ce2c286880261f5c7b1b8f38676a97 /libnm-util/crypto.c | |
parent | b61b19977634ffb34a350d5f990d37e617ff6307 (diff) | |
download | NetworkManager-203cff4d834510408c3ae312bbbc4ce2157d82c0.tar.gz |
libnm-util: move crypto tests to libnm-util/tests/
Add testing certs and keys; run crypto tests on 'make check'
Diffstat (limited to 'libnm-util/crypto.c')
-rw-r--r-- | libnm-util/crypto.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c index 3bd7405cc4..9f4ccd48a5 100644 --- a/libnm-util/crypto.c +++ b/libnm-util/crypto.c @@ -311,9 +311,9 @@ convert_iv (const char *src, GError **error) { int num; - int i; - char conv[3]; - char *c; + int i; + char conv[3]; + char *c; g_return_val_if_fail (src != NULL, NULL); @@ -326,16 +326,16 @@ convert_iv (const char *src, } num /= 2; - c = g_malloc0 (num + 1); - if (c == NULL) { + c = g_malloc0 (num + 1); + if (c == NULL) { g_set_error (error, NM_CRYPTO_ERROR, NM_CRYPTO_ERR_OUT_OF_MEMORY, _("Not enough memory to store the IV.")); return NULL; } - conv[2] = '\0'; - for (i = 0; i < num; i++) { + conv[2] = '\0'; + for (i = 0; i < num; i++) { conv[0] = src[(i * 2)]; conv[1] = src[(i * 2) + 1]; if (!g_ascii_isxdigit (conv[0]) || !g_ascii_isxdigit (conv[1])) { @@ -345,10 +345,10 @@ convert_iv (const char *src, goto error; } - c[i] = strtol(conv, NULL, 16); - } - *out_len = num; - return c; + c[i] = strtol(conv, NULL, 16); + } + *out_len = num; + return c; error: g_free (c); |