aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2003-03-05 02:58:51 +0000
committerKen Raeburn <raeburn@mit.edu>2003-03-05 02:58:51 +0000
commit3d02caa5af4dc5f8ece6286c138d08404d87936b (patch)
tree8b8664e3deb5766c139047249bfe874677830c9c
parentee94ab23e5dc170b5f16407448d4938771dbbd00 (diff)
downloadkrb5-3d02caa5af4dc5f8ece6286c138d08404d87936b.zip
krb5-3d02caa5af4dc5f8ece6286c138d08404d87936b.tar.gz
krb5-3d02caa5af4dc5f8ece6286c138d08404d87936b.tar.bz2
* aes.c (krb5int_aes_init_state): Implement.
* enc_provider.h (krb5int_enc_aes128, krb5int_enc_aes256): Declare. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15228 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/lib/crypto/enc_provider/ChangeLog6
-rw-r--r--src/lib/crypto/enc_provider/aes.c7
-rw-r--r--src/lib/crypto/enc_provider/enc_provider.h4
3 files changed, 14 insertions, 3 deletions
diff --git a/src/lib/crypto/enc_provider/ChangeLog b/src/lib/crypto/enc_provider/ChangeLog
index f46ced5..08a614e 100644
--- a/src/lib/crypto/enc_provider/ChangeLog
+++ b/src/lib/crypto/enc_provider/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-04 Ken Raeburn <raeburn@mit.edu>
+
+ * aes.c (krb5int_aes_init_state): Implement.
+ * enc_provider.h (krb5int_enc_aes128, krb5int_enc_aes256):
+ Declare.
+
2003-02-03 Ken Raeburn <raeburn@mit.edu>
* aes.c: New file.
diff --git a/src/lib/crypto/enc_provider/aes.c b/src/lib/crypto/enc_provider/aes.c
index 4a400cd..d3dc2a5 100644
--- a/src/lib/crypto/enc_provider/aes.c
+++ b/src/lib/crypto/enc_provider/aes.c
@@ -166,7 +166,12 @@ static krb5_error_code
krb5int_aes_init_state (const krb5_keyblock *key, krb5_keyusage usage,
krb5_data *state)
{
- abort();
+ state->length = 16;
+ state->data = (void *) malloc(16);
+ if (state->data == NULL)
+ return ENOMEM;
+ memset(state->data, 0, state->length);
+ return 0;
}
const struct krb5_enc_provider krb5int_enc_aes128 = {
diff --git a/src/lib/crypto/enc_provider/enc_provider.h b/src/lib/crypto/enc_provider/enc_provider.h
index 9a3dafb..5754d1a 100644
--- a/src/lib/crypto/enc_provider/enc_provider.h
+++ b/src/lib/crypto/enc_provider/enc_provider.h
@@ -29,5 +29,5 @@
extern const struct krb5_enc_provider krb5int_enc_des;
extern const struct krb5_enc_provider krb5int_enc_des3;
extern const struct krb5_enc_provider krb5int_enc_arcfour;
-
-
+extern const struct krb5_enc_provider krb5int_enc_aes128;
+extern const struct krb5_enc_provider krb5int_enc_aes256;