diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-11-08 22:14:07 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2013-11-08 22:17:10 +0100 |
commit | 76c93d23c073ef8b885503b7d28a31ffe2add6d8 (patch) | |
tree | 1dd2d22a197bc40c5330e516969a7cb1ae9bc96f /lib/opencdk/seskey.c | |
parent | 559a144f6bbcbb611453f82e655dd7438c14d1a7 (diff) | |
download | gnutls-76c93d23c073ef8b885503b7d28a31ffe2add6d8.tar.gz |
reindented code
Diffstat (limited to 'lib/opencdk/seskey.c')
-rw-r--r-- | lib/opencdk/seskey.c | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/lib/opencdk/seskey.c b/lib/opencdk/seskey.c index 7ffeb1ad1c..77fbd1f9d6 100644 --- a/lib/opencdk/seskey.c +++ b/lib/opencdk/seskey.c @@ -41,29 +41,29 @@ * The @salt parameter must be always 8 octets. **/ cdk_error_t -cdk_s2k_new (cdk_s2k_t * ret_s2k, int mode, int digest_algo, - const byte * salt) +cdk_s2k_new(cdk_s2k_t * ret_s2k, int mode, int digest_algo, + const byte * salt) { - cdk_s2k_t s2k; + cdk_s2k_t s2k; - if (!ret_s2k) - return CDK_Inv_Value; + if (!ret_s2k) + return CDK_Inv_Value; - if (mode != 0x00 && mode != 0x01 && mode != 0x03) - return CDK_Inv_Mode; + if (mode != 0x00 && mode != 0x01 && mode != 0x03) + return CDK_Inv_Mode; - if (_gnutls_hash_get_algo_len (mac_to_entry(digest_algo)) <= 0) - return CDK_Inv_Algo; + if (_gnutls_hash_get_algo_len(mac_to_entry(digest_algo)) <= 0) + return CDK_Inv_Algo; - s2k = cdk_calloc (1, sizeof *s2k); - if (!s2k) - return CDK_Out_Of_Core; - s2k->mode = mode; - s2k->hash_algo = digest_algo; - if (salt) - memcpy (s2k->salt, salt, 8); - *ret_s2k = s2k; - return 0; + s2k = cdk_calloc(1, sizeof *s2k); + if (!s2k) + return CDK_Out_Of_Core; + s2k->mode = mode; + s2k->hash_algo = digest_algo; + if (salt) + memcpy(s2k->salt, salt, 8); + *ret_s2k = s2k; + return 0; } @@ -73,25 +73,23 @@ cdk_s2k_new (cdk_s2k_t * ret_s2k, int mode, int digest_algo, * * Release the given S2K object. **/ -void -cdk_s2k_free (cdk_s2k_t s2k) +void cdk_s2k_free(cdk_s2k_t s2k) { - cdk_free (s2k); + cdk_free(s2k); } /* Make a copy of the source s2k into R_DST. */ -cdk_error_t -_cdk_s2k_copy (cdk_s2k_t * r_dst, cdk_s2k_t src) +cdk_error_t _cdk_s2k_copy(cdk_s2k_t * r_dst, cdk_s2k_t src) { - cdk_s2k_t dst; - cdk_error_t err; + cdk_s2k_t dst; + cdk_error_t err; - err = cdk_s2k_new (&dst, src->mode, src->hash_algo, src->salt); - if (err) - return err; - dst->count = src->count; - *r_dst = dst; + err = cdk_s2k_new(&dst, src->mode, src->hash_algo, src->salt); + if (err) + return err; + dst->count = src->count; + *r_dst = dst; - return 0; + return 0; } |