diff options
author | Simo Sorce <ssorce@redhat.com> | 2011-06-20 11:55:13 -0400 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2011-08-26 08:24:49 -0400 |
commit | eed401306c400ae938e2d328de22da6f729c8f3f (patch) | |
tree | 0d80aaf819a5d45a9ca1cb086f01624c35ddaa23 /daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h | |
parent | 49282290938c735c566c7d0abf57c67b69945cce (diff) | |
download | freeipa-eed401306c400ae938e2d328de22da6f729c8f3f.tar.gz freeipa-eed401306c400ae938e2d328de22da6f729c8f3f.tar.xz freeipa-eed401306c400ae938e2d328de22da6f729c8f3f.zip |
ipa-pwd-extop: Move encoding in common too
Also to be used by ipa-kdb
Diffstat (limited to 'daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h')
-rw-r--r-- | daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h index 904995eca..7d81bda3d 100644 --- a/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h +++ b/daemons/ipa-slapi-plugins/ipa-pwd-extop/ipapwd.h @@ -53,12 +53,15 @@ #include <ssl.h> #include <dirsrv/slapi-plugin.h> #include <krb5.h> +#include <kdb.h> #include <lber.h> #include <time.h> #include <iconv.h> #include <openssl/des.h> #include <openssl/md4.h> +#include "ipa_krb5.h" + #define IPAPWD_PLUGIN_NAME "ipa-pwd-extop" #define IPAPWD_FEATURE_DESC "IPA Password Manager" #define IPAPWD_PLUGIN_DESC "IPA Password Extended Operation plugin" @@ -132,25 +135,14 @@ void ipapwd_free_slapi_value_array(Slapi_Value ***svals); void free_ipapwd_krbcfg(struct ipapwd_krbcfg **cfg); /* from ipapwd_encoding.c */ -struct ipapwd_krbkeydata { - int32_t type; - struct berval value; -}; -struct ipapwd_krbkey { - struct ipapwd_krbkeydata *salt; - struct ipapwd_krbkeydata *ekey; - struct berval s2kparams; -}; struct ipapwd_keyset { uint16_t major_vno; uint16_t minor_vno; - uint32_t kvno; uint32_t mkvno; - struct ipapwd_krbkey *keys; + krb5_key_data *keys; int num_keys; }; -struct berval *encode_keys(struct ipapwd_keyset *kset); void ipapwd_keyset_free(struct ipapwd_keyset **pkset); int ipapwd_gen_hashes(struct ipapwd_krbcfg *krbcfg, |