projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Resolve minor conflict in merge.
[mech_eap.git]
/
mech_eap
/
mech_eap-noacceptor.exports
diff --git
a/mech_eap/mech_eap-noacceptor.exports
b/mech_eap/mech_eap-noacceptor.exports
index
f00df8a
..
6cdc110
100644
(file)
--- a/
mech_eap/mech_eap-noacceptor.exports
+++ b/
mech_eap/mech_eap-noacceptor.exports
@@
-13,6
+13,7
@@
gss_exchange_meta_data
gss_export_name
gss_export_sec_context
gss_get_mic
+gss_get_mic_iov
gss_import_name
gss_import_sec_context
gss_indicate_mechs
@@
-39,6
+40,7
@@
gss_store_cred
gss_unwrap
gss_unwrap_iov
gss_verify_mic
+gss_verify_mic_iov
gss_wrap
gss_wrap_iov
gss_wrap_iov_length