diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2009-01-28 00:04:15 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2009-01-28 00:04:15 +0000 |
| commit | a512f5779d0e84c3a418055d8fe653f30bcf5601 (patch) | |
| tree | 420f0e5ff6871e1acf27bc252f37cfa9867b8d47 /src/lib/crypto | |
| parent | fb96845a0ef8a47e6f35d7cd6aaadf20473dc3f5 (diff) | |
Start to phase out krb5_xfree macro, which just casts its argument to
char* and calls free.
Replace most uses, outside of the LDAP KDB plugin, which doesn't build
on my test system of the moment because of version dependencies. Add
one explicit cast to make the change warning-neutral (under gcc 4.0.1
on Mac OS X 10.5.6).
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21812 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto')
| -rw-r--r-- | src/lib/crypto/des/afsstring2key.c | 4 | ||||
| -rw-r--r-- | src/lib/crypto/keyblocks.c | 4 | ||||
| -rw-r--r-- | src/lib/crypto/keyed_checksum_types.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/crypto/des/afsstring2key.c b/src/lib/crypto/des/afsstring2key.c index 97ec2d8a1..571dab007 100644 --- a/src/lib/crypto/des/afsstring2key.c +++ b/src/lib/crypto/des/afsstring2key.c @@ -149,11 +149,11 @@ mit_afs_string_to_key (krb5_keyblock *keyblock, const krb5_data *data, /* clean & free the input string */ memset(password, 0, (size_t) pw_len); - krb5_xfree(password); + free(password); } #if 0 /* must free here because it was copied for this special case */ - krb5_xfree(salt->data); + free(salt->data); #endif return 0; } diff --git a/src/lib/crypto/keyblocks.c b/src/lib/crypto/keyblocks.c index 626443c83..5e698cc5a 100644 --- a/src/lib/crypto/keyblocks.c +++ b/src/lib/crypto/keyblocks.c @@ -65,7 +65,7 @@ void krb5int_c_free_keyblock(krb5_context context, register krb5_keyblock *val) { krb5int_c_free_keyblock_contents(context, val); - krb5_xfree(val); + free(val); } void @@ -73,7 +73,7 @@ krb5int_c_free_keyblock_contents(krb5_context context, register krb5_keyblock *k { if (key->contents) { krb5int_zap_data (key->contents, key->length); - krb5_xfree(key->contents); + free(key->contents); key->contents = 0; } } diff --git a/src/lib/crypto/keyed_checksum_types.c b/src/lib/crypto/keyed_checksum_types.c index 0e46466f2..04aa44757 100644 --- a/src/lib/crypto/keyed_checksum_types.c +++ b/src/lib/crypto/keyed_checksum_types.c @@ -83,7 +83,7 @@ void KRB5_CALLCONV krb5_free_cksumtypes(krb5_context context, krb5_cksumtype *val) { if (val) - krb5_xfree(val); + free(val); return; } |