add #define calls for abstraction

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1136 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kdb/decrypt_key.c b/src/lib/kdb/decrypt_key.c
index 7ba40edd20de2115822b216c916d3f078933bb3c..2e466526cbe43f8480e12c1979d5bdf317009cf4 100644 (file)
--- a/src/lib/kdb/decrypt_key.c
+++ b/src/lib/kdb/decrypt_key.c
@@ -53,11 +53,10 @@ krb5_keyblock *out;
     /* remember the contents of the encrypted version has a sizeof(in->length)
        integer length of the real embedded key, followed by the
        encrypted key, so the offset here is needed */
-    if (retval = (*eblock->crypto_entry->
-                 decrypt_func)((krb5_pointer) (((char *) in->contents) +
-                                               sizeof(in->length)),
-                               (krb5_pointer) out->contents,
-                               in->length-sizeof(in->length), eblock, 0)) {
+    if (retval = krb5_decrypt((krb5_pointer) (((char *) in->contents) +
+                                             sizeof(in->length)),
+                             (krb5_pointer) out->contents,
+                             in->length-sizeof(in->length), eblock, 0)) {
        free((char *)out->contents);
        out->contents = 0;
        out->length = 0;

diff --git a/src/lib/kdb/encrypt_key.c b/src/lib/kdb/encrypt_key.c
index 4cc6068b46a1c97d12314784c1e9f160e20315a9..75dab396d84a16ffac8b29629dfb95df5f65469c 100644 (file)
--- a/src/lib/kdb/encrypt_key.c
+++ b/src/lib/kdb/encrypt_key.c
@@ -54,11 +54,10 @@ krb5_keyblock *out;
     /* copy in real length */
     bcopy((char *)&in->length, (char *)out->contents, sizeof(out->length));
     /* and arrange for encrypted key */
-    if (retval = (*eblock->crypto_entry->
-                 encrypt_func)((krb5_pointer) tmpcontents,
-                               (krb5_pointer) (((char *) out->contents) +
-                                               sizeof(out->length)),
-                               in->length, eblock, 0)) {
+    if (retval = krb5_encrypt((krb5_pointer) tmpcontents,
+                             (krb5_pointer) (((char *) out->contents) +
+                                             sizeof(out->length)),
+                             in->length, eblock, 0)) {
        free((char *)out->contents);
        out->contents = 0;
        out->length = 0;