summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2000-02-26 02:17:14 +0000
committerKen Raeburn <raeburn@mit.edu>2000-02-26 02:17:14 +0000
commit3bded0d6156cfcd895af9ae7afca9b45eac98862 (patch)
tree35399c74965c00e880197ff173468b6908741f1b /doc
parent0205931a58e8acd44801007627306406df00203a (diff)
downloadkrb5-3bded0d6156cfcd895af9ae7afca9b45eac98862.tar.gz
krb5-3bded0d6156cfcd895af9ae7afca9b45eac98862.tar.xz
krb5-3bded0d6156cfcd895af9ae7afca9b45eac98862.zip
comment out doc on non-existent fn
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12078 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'doc')
-rw-r--r--doc/implement/ChangeLog5
-rw-r--r--doc/implement/encrypt-i.tex22
2 files changed, 16 insertions, 11 deletions
diff --git a/doc/implement/ChangeLog b/doc/implement/ChangeLog
index cbb2afb6ea..17976a185f 100644
--- a/doc/implement/ChangeLog
+++ b/doc/implement/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-25 Ken Raeburn <raeburn@mit.edu>
+
+ * encrypt-i.tex (subsection{Functional interface}): Comment out
+ combine_keys until/unless it gets implemented.
+
Wed Oct 12 02:19:07 1994 Theodore Y. Ts'o (tytso@dcl)
* Makefile: Added better dependencies to do two-pass latex runs
diff --git a/doc/implement/encrypt-i.tex b/doc/implement/encrypt-i.tex
index 6e4b0ab44f..57e8c833aa 100644
--- a/doc/implement/encrypt-i.tex
+++ b/doc/implement/encrypt-i.tex
@@ -123,17 +123,17 @@ filling in the keyblock address in \funcparam{*keyblock}.
When the caller has finished using the keyblock, he should call
\funcname{krb5_free_keyblock} to release its storage.
-\begin{funcdecl}{combine_keys}{krb5_error_code}{\funcin}
-\funcarg{const krb5_keyblock *}{key1}
-\funcarg{const krb5_keyblock *}{key2}
-\funcout
-\funcarg{krb5_keyblock **}{outkey}
-\end{funcdecl}
-Combine the two encryption keys \funcparam{key1} and \funcparam{key2} to
-generate a new output key \funcparam{outkey}. \funcparam{outkey} is
-filled in to point to the freshly-allocated key. When the caller is
-finished using the \funcparam{*outkey}, it should be freed with
-\funcname{krb5_free_keyblock}.
+%\begin{funcdecl}{combine_keys}{krb5_error_code}{\funcin}
+%\funcarg{const krb5_keyblock *}{key1}
+%\funcarg{const krb5_keyblock *}{key2}
+%\funcout
+%\funcarg{krb5_keyblock **}{outkey}
+%\end{funcdecl}
+%Combine the two encryption keys \funcparam{key1} and \funcparam{key2} to
+%generate a new output key \funcparam{outkey}. \funcparam{outkey} is
+%filled in to point to the freshly-allocated key. When the caller is
+%finished using the \funcparam{*outkey}, it should be freed with
+%\funcname{krb5_free_keyblock}.
\subsection{Other data elements}
In addition to the above listed function entry points, each encryption