svn rev #25221: trunk/src/plugins/preauth/pkinit/

[hartmans@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=25221
Commit By: hartmans
Log Message:
fix pkinit warnings


Changed Files:
U   trunk/src/plugins/preauth/pkinit/pkinit_crypto.h
U   trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
Modified: trunk/src/plugins/preauth/pkinit/pkinit_crypto.h
===================================================================
--- trunk/src/plugins/preauth/pkinit/pkinit_crypto.h	2011-09-21 18:40:33 UTC (rev 25220)
+++ trunk/src/plugins/preauth/pkinit/pkinit_crypto.h	2011-09-21 18:40:38 UTC (rev 25221)
@@ -635,8 +635,8 @@
 pkinit_alg_agility_kdf(krb5_context context,
                        krb5_octet_data *secret,
                        krb5_octet_data *alg_oid,
-                       krb5_principal party_u_info,
-                       krb5_principal party_v_info,
+                       krb5_const_principal party_u_info,
+                       krb5_const_principal party_v_info,
                        krb5_enctype enctype,
                        krb5_octet_data *as_req,
                        krb5_octet_data *pk_as_rep,

Modified: trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
===================================================================
--- trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2011-09-21 18:40:33 UTC (rev 25220)
+++ trunk/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c	2011-09-21 18:40:38 UTC (rev 25221)
@@ -2225,8 +2225,8 @@
 pkinit_alg_agility_kdf(krb5_context context,
                        krb5_octet_data *secret,
                        krb5_octet_data *alg_oid,
-                       krb5_principal party_u_info,
-                       krb5_principal party_v_info,
+                       krb5_const_principal party_u_info,
+                       krb5_const_principal party_v_info,
                        krb5_enctype enctype,
                        krb5_octet_data *as_req,
                        krb5_octet_data *pk_as_rep,
@@ -2302,8 +2302,8 @@
     alg_id.algorithm = *alg_oid; /*alias*/
 
     other_info_fields.algorithm_identifier = alg_id;
-    other_info_fields.party_u_info = party_u_info;
-    other_info_fields.party_v_info = party_v_info;
+    other_info_fields.party_u_info = (krb5_principal) party_u_info;
+    other_info_fields.party_v_info = (krb5_principal) party_v_info;
     other_info_fields.supp_pub_info = *supp_pub_info;
     if (0 != (retval = encode_krb5_sp80056a_other_info(&other_info_fields, &other_info)))
         goto cleanup;
@@ -4885,7 +4885,7 @@
     pkinit_cert_matching_data *md;
     krb5_principal *pkinit_sans =NULL, *upn_sans = NULL;
     struct _pkinit_cert_data *cd = (struct _pkinit_cert_data *)ch;
-    int i, j;
+    unsigned int i, j;
     char buf[DN_BUF_LEN];
     unsigned int bufsize = sizeof(buf);