diff options
| author | Theodore Tso <tytso@mit.edu> | 1993-10-15 16:52:33 +0000 |
|---|---|---|
| committer | Theodore Tso <tytso@mit.edu> | 1993-10-15 16:52:33 +0000 |
| commit | 5bb27f267ab3039b23452595cf345eecd81acf4d (patch) | |
| tree | d2d3a8455fc8c53540fa8fc8ebad73cf42ff86a3 /src/lib/crypto | |
| parent | 3909e34b87a1a783d63e276568f2549cdc2d2795 (diff) | |
| download | krb5-5bb27f267ab3039b23452595cf345eecd81acf4d.tar.gz krb5-5bb27f267ab3039b23452595cf345eecd81acf4d.tar.xz krb5-5bb27f267ab3039b23452595cf345eecd81acf4d.zip | |
Change use of xfree to krb5_xfree to prevent namespace pollution
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2670 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto')
| -rw-r--r-- | src/lib/crypto/des/fin_rndkey.c | 2 | ||||
| -rw-r--r-- | src/lib/crypto/des/new_rn_key.c | 6 | ||||
| -rw-r--r-- | src/lib/crypto/des/random_key.c | 2 | ||||
| -rw-r--r-- | src/lib/crypto/des/string2key.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/crypto/des/fin_rndkey.c b/src/lib/crypto/des/fin_rndkey.c index 11d37751a..14758851e 100644 --- a/src/lib/crypto/des/fin_rndkey.c +++ b/src/lib/crypto/des/fin_rndkey.c @@ -41,7 +41,7 @@ krb5_error_code mit_des_finish_random_key (DECLARG(krb5_pointer *, seed)) OLDDECLARG(krb5_pointer *, seed) { memset((char *)*seed, 0, sizeof(mit_des_random_key_seed) ); - xfree(*seed); + krb5_xfree(*seed); *seed = 0; return 0; } diff --git a/src/lib/crypto/des/new_rn_key.c b/src/lib/crypto/des/new_rn_key.c index 681a799d6..2d34df19d 100644 --- a/src/lib/crypto/des/new_rn_key.c +++ b/src/lib/crypto/des/new_rn_key.c @@ -111,10 +111,10 @@ void mit_des_init_random_number_generator(key,p_seed) libraries */ register krb5_address **addr2; for (addr2 = addrs; *addr2; addr2++) { - xfree((*addr2)->contents); - xfree(*addr2); + krb5_xfree((*addr2)->contents); + krb5_xfree(*addr2); } - xfree(addrs); + krb5_xfree(addrs); } /* * Generate a tempory value that depends on the key and host_id diff --git a/src/lib/crypto/des/random_key.c b/src/lib/crypto/des/random_key.c index 8c835dbb4..2c2f27745 100644 --- a/src/lib/crypto/des/random_key.c +++ b/src/lib/crypto/des/random_key.c @@ -48,7 +48,7 @@ OLDDECLARG(krb5_keyblock **, keyblock) if (!(randkey = (krb5_keyblock *)malloc(sizeof(*randkey)))) return ENOMEM; if (!(randkey->contents = (krb5_octet *)malloc(sizeof(mit_des_cblock)))) { - xfree(randkey); + krb5_xfree(randkey); return ENOMEM; } randkey->length = sizeof(mit_des_cblock); diff --git a/src/lib/crypto/des/string2key.c b/src/lib/crypto/des/string2key.c index e19b1f5ae..ce3bdba23 100644 --- a/src/lib/crypto/des/string2key.c +++ b/src/lib/crypto/des/string2key.c @@ -162,7 +162,7 @@ OLDDECLARG(const krb5_data *, salt) /* clean & free the input string */ memset(copystr, 0, length); - xfree(copystr); + krb5_xfree(copystr); /* now fix up key parity again */ mit_des_fixup_key_parity(key); |