From: Sam Hartman <hartmans@mit.edu>
Date: Wed, 23 Dec 2009 21:11:09 +0000 (+0000)
Subject: Move symbols needed by pkinit pa_pkinit_k x to k5-int-pkinit.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2226988dc6884fabd92d8b48c9e32e30c01df98;p=thirdparty%2Fkrb5.git

Move symbols needed by pkinit pa_pkinit_k x to k5-int-pkinit.h

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/anonymous@23515 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/include/k5-int-pkinit.h b/src/include/k5-int-pkinit.h
index 77bd260ffb..8dcbd5d4f3 100644
--- a/src/include/k5-int-pkinit.h
+++ b/src/include/k5-int-pkinit.h
@@ -283,4 +283,15 @@ decode_krb5_td_dh_parameters(const krb5_data *, krb5_algorithm_identifier ***);
 
 void krb5_free_typed_data(krb5_context, krb5_typed_data **);
 
+krb5_error_code
+encode_krb5_enc_data(const krb5_enc_data *, krb5_data **);
+
+krb5_error_code
+encode_krb5_encryption_key(const krb5_keyblock *rep, krb5_data **code);
+
+krb5_error_code
+krb5_encrypt_helper(krb5_context context, const krb5_keyblock *key,
+                    krb5_keyusage keyusage, const krb5_data *plain,
+                    krb5_enc_data *cipher);
+
 #endif /* _KRB5_INT_PKINIT_H */
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index ebd08dc094..1f6210936e 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -806,11 +806,6 @@ krb5_error_code krb5_crypto_us_timeofday(krb5_int32 *, krb5_int32 *);
 
 /* this helper fct is in libkrb5, but it makes sense declared here. */
 
-krb5_error_code
-krb5_encrypt_helper(krb5_context context, const krb5_keyblock *key,
-                    krb5_keyusage keyusage, const krb5_data *plain,
-                    krb5_enc_data *cipher);
-
 krb5_error_code
 krb5_encrypt_keyhelper(krb5_context context, krb5_key key,
                        krb5_keyusage keyusage, const krb5_data *plain,
@@ -1571,9 +1566,6 @@ encode_krb5_authenticator(const krb5_authenticator *rep, krb5_data **code);
 krb5_error_code
 encode_krb5_ticket(const krb5_ticket *rep, krb5_data **code);
 
-krb5_error_code
-encode_krb5_encryption_key(const krb5_keyblock *rep, krb5_data **code);
-
 krb5_error_code
 encode_krb5_enc_tkt_part(const krb5_enc_tkt_part *rep, krb5_data **code);
 
@@ -1659,9 +1651,6 @@ encode_krb5_etype_info(krb5_etype_info_entry *const *, krb5_data **code);
 krb5_error_code
 encode_krb5_etype_info2(krb5_etype_info_entry *const *, krb5_data **code);
 
-krb5_error_code
-encode_krb5_enc_data(const krb5_enc_data *, krb5_data **);
-
 krb5_error_code
 encode_krb5_pa_enc_ts(const krb5_pa_enc_ts *, krb5_data **);