diff options
| author | John Kohl <jtkohl@mit.edu> | 1990-02-05 15:31:08 +0000 |
|---|---|---|
| committer | John Kohl <jtkohl@mit.edu> | 1990-02-05 15:31:08 +0000 |
| commit | f845b77f810b0da353b859aefb1e5c1774a3d22d (patch) | |
| tree | cbd1045ac379f8068d55204aa341416ab3b07159 /src/include | |
| parent | ef198201e7ff34620a1b392de235bad39453dbe9 (diff) | |
| download | krb5-f845b77f810b0da353b859aefb1e5c1774a3d22d.tar.gz krb5-f845b77f810b0da353b859aefb1e5c1774a3d22d.tar.xz krb5-f845b77f810b0da353b859aefb1e5c1774a3d22d.zip | |
modify string_to_key and sum_func signatures
add cksumarray & valid_cksumtype
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@278 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/krb5/encryption.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/include/krb5/encryption.h b/src/include/krb5/encryption.h index 7a7f38326..a792bce85 100644 --- a/src/include/krb5/encryption.h +++ b/src/include/krb5/encryption.h @@ -49,7 +49,8 @@ typedef struct _krb5_cryptosystem_entry { krb5_keyblock *)); krb5_error_code (*finish_key) PROTOTYPE((krb5_encrypt_block *)); krb5_error_code (*string_to_key) PROTOTYPE((krb5_keytype, krb5_keyblock *, - char *, krb5_principal *)); + krb5_data *, + krb5_principal)); krb5_error_code (*random_key) PROTOTYPE((krb5_pointer, krb5_keyblock **)); krb5_error_code (*init_random_key) PROTOTYPE((krb5_keyblock *, @@ -68,10 +69,12 @@ typedef struct _krb5_cs_table_entry { /* could be used in a table to find a sumtype */ typedef struct _krb5_checksum_entry { - krb5_pointer (*sum_func) PROTOTYPE ((krb5_pointer in, krb5_pointer out, - krb5_pointer seed, - size_t in_length, - size_t seed_length)); + krb5_error_code (*sum_func) PROTOTYPE ((krb5_pointer /* in */, + krb5_pointer /* out */, + krb5_pointer /* seed */, + size_t /* in_length */, + size_t /* seed_length */, + krb5_checksum * /* out_cksum */)); int checksum_length; /* length of stuff returned by sum_func */ } krb5_checksum_entry; @@ -108,7 +111,12 @@ typedef struct _krb5_checksum_entry { extern krb5_cs_table_entry *krb5_csarray[]; extern int krb5_max_cryptosystem; /* max entry in array */ +extern krb5_checksum_entry *krb5_cksumarray[]; +extern int krb5_max_cksum; /* max entry in array */ + #define valid_etype(etype) ((etype <= krb5_max_cryptosystem) && (etype > 0) && krb5_csarray[etype]) +#define valid_cksumtype(cktype) ((cktype <= krb5_max_cksum) && (cktype > 0) && krb5_cksumarray[cktype]) + #endif /* __KRB5_ENCRYPTION__ */ |