Hello community,
here is the log from the commit of package krb5
checked in at Tue Jul 4 14:25:14 CEST 2006.
--------
--- krb5/krb5-doc.changes 2006-03-27 14:15:07.000000000 +0200
+++ krb5/krb5-doc.changes 2006-07-03 15:26:05.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Jul 3 15:01:57 CEST 2006 - mc@suse.de
+
+- update to version 1.5
+ * KDB abstraction layer, donated by Novell.
+ * plug-in architecture, allowing for extension modules to be
+ loaded at run-time.
+ * multi-mechanism GSS-API implementation ("mechglue"),
+ donated by Sun Microsystems
+ * Simple and Protected GSS-API negotiation mechanism ("SPNEGO")
+ implementation, donated by Sun Microsystems
+- remove obsolete patches and add some new
+
+-------------------------------------------------------------------
--- krb5/krb5.changes 2006-05-26 14:50:04.000000000 +0200
+++ krb5/krb5.changes 2006-07-03 15:26:05.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Jul 3 14:59:35 CEST 2006 - mc@suse.de
+
+- update to version 1.5
+ * KDB abstraction layer, donated by Novell.
+ * plug-in architecture, allowing for extension modules to be
+ loaded at run-time.
+ * multi-mechanism GSS-API implementation ("mechglue"),
+ donated by Sun Microsystems
+ * Simple and Protected GSS-API negotiation mechanism ("SPNEGO")
+ implementation, donated by Sun Microsystems
+- remove obsolete patches and add some new
+
+-------------------------------------------------------------------
Old:
----
krb5-1.4-fix-uninitialized-vars.dif
krb5-1.4.2-kadm5-doc.dif
krb5-1.4.2-testfix.dif
krb5-1.4.3-EncryptWithMasterKey.dif
krb5-1.4.3-kadm5-tex.dif
krb5-1.4.3-set_gnu_source.dif
krb5-1.4.3.tar.bz2
New:
----
kprop-use-mkstemp.dif
krb5-1.5.tar.bz2
trunk-EncryptWithMasterKey.dif
trunk-fix-uninitialized-vars.dif
trunk-ldap_util-man.dif
warning-fix-lib-crypto-des.dif
warning-fix-lib-crypto-dk.dif
warning-fix-lib-crypto-enc_provider.dif
warning-fix-lib-crypto-yarrow_arcfour.dif
warning-fix-lib-crypto.dif
warning-fix-util-support.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ krb5-doc.spec ++++++
--- /var/tmp/diff_new_pack.CB9zdo/_old 2006-07-04 14:24:56.000000000 +0200
+++ /var/tmp/diff_new_pack.CB9zdo/_new 2006-07-04 14:24:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package krb5-doc (Version 1.4.3)
+# spec file for package krb5-doc (Version 1.5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,18 +12,17 @@
Name: krb5-doc
BuildRequires: ghostscript-library latex2html te_ams
-Version: 1.4.3
-Release: 19
+Version: 1.5
+Release: 2
+%define srcRoot krb5-1.5
Summary: MIT Kerberos5 Implementation--Documentation
License: X11/MIT
URL: http://web.mit.edu/kerberos/www/
Group: Documentation/Other
-Source: krb5-%{version}.tar.bz2
+Source: krb5-1.5.tar.bz2
Source1: README.Source
Source2: Makefile.kadm5
Patch0: krb5-1.3.5-perlfix.dif
-Patch1: krb5-1.4.2-kadm5-doc.dif
-Patch2: krb5-1.4.3-kadm5-tex.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArchitectures: noarch
@@ -43,11 +42,9 @@
Tom Yu
%prep
-%setup -n krb5-%{version}
+%setup -n %{srcRoot}
%patch0
-%patch1
-%patch2
-cp %{_sourcedir}/Makefile.kadm5 %{_builddir}/krb5-%{version}/doc/kadm5/Makefile
+cp %{_sourcedir}/Makefile.kadm5 %{_builddir}/%{srcRoot}/doc/kadm5/Makefile
%build
@@ -89,6 +86,16 @@
%doc doc/html
%changelog -n krb5-doc
+* Mon Jul 03 2006 - mc@suse.de
+- update to version 1.5
+ * KDB abstraction layer, donated by Novell.
+ * plug-in architecture, allowing for extension modules to be
+ loaded at run-time.
+ * multi-mechanism GSS-API implementation ("mechglue"),
+ donated by Sun Microsystems
+ * Simple and Protected GSS-API negotiation mechanism ("SPNEGO")
+ implementation, donated by Sun Microsystems
+- remove obsolete patches and add some new
* Mon Mar 13 2006 - mc@suse.de
- set BuildArchitectures to noarch
- set norootforbuild
++++++ krb5.spec ++++++
--- /var/tmp/diff_new_pack.CB9zdo/_old 2006-07-04 14:24:56.000000000 +0200
+++ /var/tmp/diff_new_pack.CB9zdo/_new 2006-07-04 14:24:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package krb5 (Version 1.4.3)
+# spec file for package krb5 (Version 1.5)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,28 +11,34 @@
# norootforbuild
Name: krb5
+Version: 1.5
+Release: 2
BuildRequires: libcom_err
-%define vendorFiles %{_builddir}/%{name}-%{version}/vendor-files/
+%define srcRoot krb5-1.5
+%define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
%define krb5docdir %{_defaultdocdir}/%{name}
-Version: 1.4.3
-Release: 19
Provides: heimdal-lib
Obsoletes: heimdal-lib
Summary: MIT Kerberos5 Implementation--Libraries
License: X11/MIT
URL: http://web.mit.edu/kerberos/www/
Group: Productivity/Networking/Security
-Source: %{name}-%{version}.tar.bz2
+Source: krb5-1.5.tar.bz2
Source1: vendor-files.tar.bz2
Source2: README.Source
Source3: spx.c
Source4: EncryptWithMasterKey.c
-Patch1: krb5-1.4-fix-uninitialized-vars.dif
+Patch1: trunk-fix-uninitialized-vars.dif
Patch2: krb5-1.4-compile_pie.dif
Patch3: krb5-1.4-fix-segfault.dif
-Patch4: krb5-1.4.2-testfix.dif
-Patch5: krb5-1.4.3-set_gnu_source.dif
-Patch6: krb5-1.4.3-EncryptWithMasterKey.dif
+Patch6: trunk-EncryptWithMasterKey.dif
+Patch12: warning-fix-util-support.dif
+Patch14: warning-fix-lib-crypto-des.dif
+Patch15: warning-fix-lib-crypto-dk.dif
+Patch16: warning-fix-lib-crypto.dif
+Patch17: warning-fix-lib-crypto-enc_provider.dif
+Patch18: warning-fix-lib-crypto-yarrow_arcfour.dif
+Patch20: kprop-use-mkstemp.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: mktemp, grep, /bin/touch
@@ -156,28 +162,35 @@
Tom Yu
%prep
-%setup -q
-%setup -a 1 -T -D
-if [ -e %{_builddir}/%{name}-%{version}/src/appl/telnet/libtelnet/spx.c ]
+%setup -q -n %{srcRoot}
+%setup -a 1 -T -D -n %{srcRoot}
+if [ -e %{_builddir}/%{srcRoot}/src/appl/telnet/libtelnet/spx.c ]
then
echo "spx.c contains potential legal risks."
exit 1;
else
- cp %{_sourcedir}/spx.c %{_builddir}/%{name}-%{version}/src/appl/telnet/libtelnet/spx.c
+ cp %{_sourcedir}/spx.c %{_builddir}/%{srcRoot}/src/appl/telnet/libtelnet/spx.c
fi
%patch1
%patch2
%patch3
-%patch4
-%patch5
%patch6
-cp %{_sourcedir}/EncryptWithMasterKey.c %{_builddir}/%{name}-%{version}/src/kadmin/dbutil/EncryptWithMasterKey.c
+cd %{_builddir}/%{srcRoot}/src
+%patch12
+%patch14
+%patch15
+%patch16
+%patch17
+%patch18
+%patch20
+cd -
+cp %{_sourcedir}/EncryptWithMasterKey.c %{_builddir}/%{srcRoot}/src/kadmin/dbutil/EncryptWithMasterKey.c
%build
cd src
%{?suse_update_config:%{suse_update_config -f}}
./util/reconf
-CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -fno-strict-aliasing " \
+CFLAGS="$RPM_OPT_FLAGS -I/usr/include/et -fno-strict-aliasing -D_GNU_SOURCE " \
./configure \
--prefix=/usr/lib/mit \
--sysconfdir=%{_sysconfdir} \
@@ -190,10 +203,7 @@
--enable-shared \
--disable-static \
--enable-kdc-replay-cache \
- --enable-dns-for-kdc \
--enable-dns-for-realm \
- --enable-dns \
- --with-krb4 \
--with-system-et \
--with-system-ss
make %{?jobs:-j%jobs}
@@ -222,7 +232,7 @@
mv %{buildroot}%{_mandir}/man1/${n} %{buildroot}%{_mandir}/man1/k${n}
done
# all libs must have permissions 0755
-for lib in `find %{buildroot}/%{_libdir}/ -type f -name "*.so.*"`
+for lib in `find %{buildroot}/%{_libdir}/ -type f -name "*.so*"`
do
chmod 0755 ${lib}
done
@@ -259,8 +269,8 @@
install -d -m 755 %{buildroot}/%{krb5docdir}
install -m 644 %{vendorFiles}/README.ConvertHeimdalMIT %{buildroot}/%{krb5docdir}/README.ConvertHeimdalMIT
install -m 744 %{vendorFiles}/heimdal2mit-DumpConvert.pl %{buildroot}/%{krb5docdir}/heimdal2mit-DumpConvert.pl
-install -m 644 %{_builddir}/%{name}-%{version}/README %{buildroot}/%{krb5docdir}/README
-install -m 644 %{_builddir}/%{name}-%{version}/src/ChangeLog %{buildroot}/%{krb5docdir}/ChangeLog
+install -m 644 %{_builddir}/%{srcRoot}/README %{buildroot}/%{krb5docdir}/README
+install -m 644 %{_builddir}/%{srcRoot}/doc/CHANGES %{buildroot}/%{krb5docdir}/CHANGES
install -m 744 %{vendorFiles}/simple_convert_krb5conf.pl %{buildroot}/%{krb5docdir}/simple_convert_krb5conf.pl
# cleanup
rm -f %{buildroot}/usr/share/man/man1/tmac.doc*
@@ -347,7 +357,7 @@
%dir %{krb5docdir}
%attr(0700,root,root) %dir /var/log/krb5
%doc %{krb5docdir}/README
-%doc %{krb5docdir}/ChangeLog
+%doc %{krb5docdir}/CHANGES
%doc %{krb5docdir}/simple_convert_krb5conf.pl
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/krb5.conf
%attr(0644,root,root) %config /etc/profile.d/krb5*
@@ -368,6 +378,9 @@
%dir /usr/lib/mit/sbin
%dir %{_localstatedir}/lib/kerberos/
%dir %{_localstatedir}/lib/kerberos/krb5kdc
+%dir %{_libdir}/krb5
+%dir %{_libdir}/krb5/plugins
+%dir %{_libdir}/krb5/plugins/kdb
%doc %{krb5docdir}/heimdal2mit-DumpConvert.pl
%doc %{krb5docdir}/README.ConvertHeimdalMIT
%attr(0600,root,root) %config(noreplace) %{_localstatedir}/lib/kerberos/krb5kdc/kdc.conf
@@ -385,6 +398,7 @@
/usr/lib/mit/sbin/login.krb5
/usr/lib/mit/sbin/sim_server
/usr/lib/mit/sbin/EncryptWithMasterKey
+%{_libdir}/krb5/plugins/kdb/*.so
%{_mandir}/man5/kdc.conf.5*
%{_mandir}/man5/krb5.conf.5*
%{_mandir}/man5/.k5login.5*
@@ -420,6 +434,7 @@
/usr/bin/klist
%{_mandir}/man1/kvno.1*
%{_mandir}/man1/kinit.1*
+%{_mandir}/man1/krb524init.1*
%{_mandir}/man1/kdestroy.1*
%{_mandir}/man1/kpasswd.1*
%{_mandir}/man1/klist.1*
@@ -489,6 +504,16 @@
%{_mandir}/man1/krb5-config.1*
%changelog -n krb5
+* Mon Jul 03 2006 - mc@suse.de
+- update to version 1.5
+ * KDB abstraction layer, donated by Novell.
+ * plug-in architecture, allowing for extension modules to be
+ loaded at run-time.
+ * multi-mechanism GSS-API implementation ("mechglue"),
+ donated by Sun Microsystems
+ * Simple and Protected GSS-API negotiation mechanism ("SPNEGO")
+ implementation, donated by Sun Microsystems
+- remove obsolete patches and add some new
* Fri May 26 2006 - ro@suse.de
- libcom is not in e2fsck-devel but in its own package now, change
Requires accordingly.
++++++ kprop-use-mkstemp.dif ++++++
--- slave/kprop.c
+++ slave/kprop.c 2006/06/21 12:38:34
@@ -215,6 +215,7 @@
krb5_error_code retval;
static char tkstring[] = "/tmp/kproptktXXXXXX";
krb5_keytab keytab = NULL;
+ int ret = 0;
/*
* Figure out what tickets we'll be using to send stuff
@@ -240,7 +241,15 @@
/*
* Initialize cache file which we're going to be using
*/
+#ifdef HAVE_MKSTEMP
+ ret = mkstemp(tkstring);
+ if (ret == -1) {
+ com_err(progname, errno, "while initialize cache file");
+ exit(1);
+ } else close(ret);
+#else
(void) mktemp(tkstring);
+#endif
sprintf(buf, "FILE:%s", tkstring);
retval = krb5_cc_resolve(context, buf, &ccache);
++++++ krb5-1.4-compile_pie.dif ++++++
--- /var/tmp/diff_new_pack.CB9zdo/_old 2006-07-04 14:24:56.000000000 +0200
+++ /var/tmp/diff_new_pack.CB9zdo/_new 2006-07-04 14:24:56.000000000 +0200
@@ -297,8 +297,8 @@
all:: kprop kpropd
CLIENTSRCS= $(srcdir)/kprop.c
---- src/util/pty/Makefile.in
-+++ src/util/pty/Makefile.in 2005/06/17 14:44:50
+--- src/appl/libpty/Makefile.in
++++ src/appl/libpty/Makefile.in 2005/06/17 14:44:50
@@ -10,6 +10,8 @@
PROG_LIBPATH=-L$(TOPLIBD)
PROG_RPATH=$(KRB5_LIBDIR)
++++++ krb5-1.4.3.tar.bz2 -> krb5-1.5.tar.bz2 ++++++
krb5/krb5-1.4.3.tar.bz2 krb5/krb5-1.5.tar.bz2 differ: char 11, line 1
++++++ trunk-EncryptWithMasterKey.dif ++++++
--- src/kadmin/dbutil/Makefile.in
+++ src/kadmin/dbutil/Makefile.in 2006/06/02 11:40:51
@@ -22,21 +22,28 @@
OBJS = kdb5_util.o kdb5_create.o kadm5_create.o string_table.o kdb5_destroy.o kdb5_stash.o import_err.o strtok.o dump.o ovload.o
-all:: $(PROG)
+all:: $(PROG) EncryptWithMasterKey
$(PROG): $(OBJS) $(KADMSRV_DEPLIBS) $(KRB4COMPAT_DEPLIBS)
$(CC_LINK) -o $(PROG) $(OBJS) $(KADMSRV_LIBS) $(KDB_DEP_LIB) $(KRB4COMPAT_LIBS)
+EncryptWithMasterKey: EncryptWithMasterKey.o
+ $(CC_LINK) -o EncryptWithMasterKey EncryptWithMasterKey.o $(KRB5_BASE_LIBS)
+
+EncryptWithMasterKey.o: EncryptWithMasterKey.c
+
+
import_err.c import_err.h: $(srcdir)/import_err.et
$(OBJS): import_err.h
install::
$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
+ $(INSTALL_PROGRAM) EncryptWithMasterKey ${DESTDIR}$(ADMIN_BINDIR)/EncryptWithMasterKey
$(INSTALL_DATA) $(srcdir)/$(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8
clean::
- $(RM) $(PROG) $(OBJS) import_err.c import_err.h
+ $(RM) $(PROG) $(OBJS) import_err.c import_err.h EncryptWithMasterKey EncryptWithMasterKey.o
# +++ Dependency line eater +++
#
++++++ trunk-fix-uninitialized-vars.dif ++++++
--- src/appl/gssftp/ftpd/ftpd.c
+++ src/appl/gssftp/ftpd/ftpd.c 2005/10/28 10:30:57
@@ -2390,7 +2390,9 @@
char service_name[MAXHOSTNAMELEN+10];
char **gservice;
struct hostent *hp;
-
+ stat_maj = 0;
+ accept_maj = 0;
+ acquire_maj = 0;
kerror = radix_encode(adata, gout_buf, &length, 1);
if (kerror) {
--- src/appl/telnet/libtelnet/kerberos5.c
+++ src/appl/telnet/libtelnet/kerberos5.c 2005/10/28 10:32:04
@@ -260,6 +260,7 @@
if (telnet_krb5_realm != NULL) {
krb5_data rdata;
+ rdata.magic = 0;
rdata.length = strlen(telnet_krb5_realm);
rdata.data = (char *) malloc(rdata.length + 1);
if (rdata.data == NULL) {
--- src/kdc/do_tgs_req.c
+++ src/kdc/do_tgs_req.c 2005/10/28 10:33:09
@@ -474,6 +474,8 @@
goto cleanup;
}
enc_tkt_transited.tr_type = KRB5_DOMAIN_X500_COMPRESS;
+ enc_tkt_transited.magic = 0;
+ enc_tkt_transited.tr_contents.magic = 0;
enc_tkt_transited.tr_contents.data = 0;
enc_tkt_transited.tr_contents.length = 0;
enc_tkt_reply.transited = enc_tkt_transited;
--- src/lib/krb5/asn.1/krb5_decode.c
+++ src/lib/krb5/asn.1/krb5_decode.c 2005/10/28 10:34:04
@@ -526,6 +526,7 @@
setup();
alloc_field(*rep,krb5_safe);
clear_field(rep,checksum);
+ tmpbody.magic = 0;
check_apptag(20);
{ begin_structure();
--- src/plugins/kdb/db2/libdb2/hash/dbm.c
+++ src/plugins/kdb/db2/libdb2/hash/dbm.c 2005/10/28 10:35:59
@@ -90,6 +90,7 @@
if (__cur_db == NULL) {
no_open_db();
item.dptr = 0;
+ item.dsize = 0;
return (item);
}
return (kdb2_dbm_fetch(__cur_db, key));
@@ -103,6 +104,7 @@
if (__cur_db == NULL) {
no_open_db();
item.dptr = 0;
+ item.dsize = 0;
return (item);
}
return (kdb2_dbm_firstkey(__cur_db));
@@ -117,6 +119,7 @@
if (__cur_db == NULL) {
no_open_db();
item.dptr = 0;
+ item.dsize = 0;
return (item);
}
return (kdb2_dbm_nextkey(__cur_db));
++++++ trunk-ldap_util-man.dif ++++++
--- src/plugins/kdb/ldap/ldap_util/Makefile.in
+++ src/plugins/kdb/ldap/ldap_util/Makefile.in 2006/06/02 14:36:18
@@ -23,6 +23,7 @@
install::
$(INSTALL_PROGRAM) $(PROG) ${DESTDIR}$(ADMIN_BINDIR)/$(PROG)
+ $(INSTALL_DATA) $(PROG).M ${DESTDIR}$(ADMIN_MANDIR)/$(PROG).8
clean::
$(RM) $(PROG) $(OBJS)
++++++ warning-fix-lib-crypto-des.dif ++++++
# fix warning:
# string2key.c: In function 'mit_des_string_to_key_int':
# string2key.c:229: warning: pointer targets in passing argument 1 of 'mit_des_cbc_cksum' differ in signedness
#
--- lib/crypto/des/string2key.c
+++ lib/crypto/des/string2key.c 2006/06/21 08:16:12
@@ -44,7 +44,7 @@
krb5_ui_4 x, y, z;
unsigned char *p;
des_key_schedule sched;
- char *copy;
+ unsigned char *copy;
size_t copylen;
/* As long as the architecture is big-endian or little-endian, it
++++++ warning-fix-lib-crypto-dk.dif ++++++
# warning fix for:
# derive.c:63: warning: pointer targets in assignment differ in signedness
# derive.c:66: warning: pointer targets in assignment differ in signedness
# derive.c:75: warning: pointer targets in passing argument 2 of 'krb5_nfold' differ in signedness
# derive.c:75: warning: pointer targets in passing argument 4 of 'krb5_nfold' differ in signedness
# derive.c:96: warning: pointer targets in assignment differ in signedness
# derive.c: In function 'krb5_derive_random':
# derive.c:148: warning: pointer targets in assignment differ in signedness
# derive.c:151: warning: pointer targets in assignment differ in signedness
# derive.c:160: warning: pointer targets in passing argument 2 of 'krb5_nfold' differ in signedness
# derive.c:160: warning: pointer targets in passing argument 4 of 'krb5_nfold' differ in signedness
#
# dk_decrypt.c:153: warning: pointer targets in assignment differ in signedness
#
# dk_encrypt.c: In function 'krb5_dk_encrypt':
# dk_encrypt.c:98: warning: pointer targets in assignment differ in signedness
# dk_encrypt.c:119: warning: pointer targets in assignment differ in signedness
# dk_encrypt.c:132: warning: pointer targets in assignment differ in signedness
# dk_encrypt.c:141: warning: pointer targets in assignment differ in signedness
# dk_encrypt.c: In function 'krb5int_aes_dk_encrypt':
# dk_encrypt.c:263: warning: pointer targets in assignment differ in signedness
# dk_encrypt.c:284: warning: pointer targets in assignment differ in signedness
# dk_encrypt.c:298: warning: pointer targets in assignment differ in signedness
# dk_encrypt.c:308: warning: pointer targets in assignment differ in signedness
#
--- lib/crypto/dk/derive.c
+++ lib/crypto/dk/derive.c 2006/06/21 10:13:47
@@ -60,10 +60,10 @@
return(ENOMEM);
}
- inblock.data = inblockdata;
+ inblock.data = (char*)inblockdata;
inblock.length = blocksize;
- outblock.data = outblockdata;
+ outblock.data = (char*)outblockdata;
outblock.length = blocksize;
/* initialize the input block */
@@ -71,8 +71,8 @@
if (in_constant->length == inblock.length) {
memcpy(inblock.data, in_constant->data, inblock.length);
} else {
- krb5_nfold(in_constant->length*8, in_constant->data,
- inblock.length*8, inblock.data);
+ krb5_nfold(in_constant->length*8, (unsigned char*)in_constant->data,
+ inblock.length*8, (unsigned char*)inblock.data);
}
/* loop encrypting the blocks until enough key bytes are generated */
@@ -93,7 +93,7 @@
/* postprocess the key */
- inblock.data = rawkey;
+ inblock.data = (char*)rawkey;
inblock.length = keybytes;
(*(enc->make_key))(&inblock, outkey);
@@ -145,10 +145,10 @@
return(ENOMEM);
}
- inblock.data = inblockdata;
+ inblock.data = (char*)inblockdata;
inblock.length = blocksize;
- outblock.data = outblockdata;
+ outblock.data = (char*)outblockdata;
outblock.length = blocksize;
/* initialize the input block */
@@ -156,8 +156,8 @@
if (in_constant->length == inblock.length) {
memcpy(inblock.data, in_constant->data, inblock.length);
} else {
- krb5_nfold(in_constant->length*8, in_constant->data,
- inblock.length*8, inblock.data);
+ krb5_nfold(in_constant->length*8, (unsigned char*)in_constant->data,
+ inblock.length*8, (unsigned char*)inblock.data);
}
/* loop encrypting the blocks until enough key bytes are generated */
--- lib/crypto/dk/dk_decrypt.c
+++ lib/crypto/dk/dk_decrypt.c 2006/06/21 10:13:47
@@ -150,7 +150,7 @@
cn = (unsigned char *) d1.data + d1.length - blocksize;
else if (ivec_mode == 1) {
int nblocks = (d1.length + blocksize - 1) / blocksize;
- cn = d1.data + blocksize * (nblocks - 2);
+ cn = (unsigned char *) d1.data + blocksize * (nblocks - 2);
} else
abort();
} else
--- lib/crypto/dk/dk_encrypt.c
+++ lib/crypto/dk/dk_encrypt.c 2006/06/21 10:19:00
@@ -95,7 +95,7 @@
/* derive the keys */
- d1.data = constantdata;
+ d1.data = (char*)constantdata;
d1.length = K5CLENGTH;
d1.data[0] = (usage>>24)&0xff;
@@ -116,7 +116,7 @@
/* put together the plaintext */
d1.length = blocksize;
- d1.data = plaintext;
+ d1.data = (char*)plaintext;
if ((ret = krb5_c_random_make_octets(/* XXX */ 0, &d1)))
goto cleanup;
@@ -129,7 +129,7 @@
/* encrypt the plaintext */
d1.length = plainlen;
- d1.data = plaintext;
+ d1.data = (char*)plaintext;
d2.length = plainlen;
d2.data = output->data;
@@ -138,7 +138,7 @@
goto cleanup;
if (ivec != NULL && ivec->length == blocksize)
- cn = d2.data + d2.length - blocksize;
+ cn = (unsigned char*)d2.data + d2.length - blocksize;
else
cn = NULL;
@@ -260,7 +260,7 @@
/* derive the keys */
- d1.data = constantdata;
+ d1.data = (char*)constantdata;
d1.length = K5CLENGTH;
d1.data[0] = (usage>>24)&0xff;
@@ -281,7 +281,7 @@
/* put together the plaintext */
d1.length = blocksize;
- d1.data = plaintext;
+ d1.data = (char*)plaintext;
if ((ret = krb5_c_random_make_octets(/* XXX */ 0, &d1)))
goto cleanup;
@@ -295,7 +295,7 @@
/* encrypt the plaintext */
d1.length = plainlen;
- d1.data = plaintext;
+ d1.data = (char*)plaintext;
d2.length = plainlen;
d2.data = output->data;
@@ -305,7 +305,7 @@
if (ivec != NULL && ivec->length == blocksize) {
int nblocks = (d2.length + blocksize - 1) / blocksize;
- cn = d2.data + blocksize * (nblocks - 2);
+ cn = (unsigned char*)d2.data + blocksize * (nblocks - 2);
} else
cn = NULL;
++++++ warning-fix-lib-crypto-enc_provider.dif ++++++
# fix warnings for:
# aes.c: In function 'krb5int_aes_encrypt':
# aes.c:72: warning: pointer targets in passing argument 1 of 'krb5int_aes_enc_blk' differ in signedness
# aes.c:72: warning: pointer targets in passing argument 2 of 'krb5int_aes_enc_blk' differ in signedness
# aes.c:77: warning: pointer targets in passing argument 1 of 'xorblock' differ in signedness
# aes.c:86: warning: pointer targets in passing argument 1 of 'xorblock' differ in signedness
# aes.c:94: warning: pointer targets in passing argument 1 of 'xorblock' differ in signedness
# aes.c:94: warning: pointer targets in passing argument 2 of 'xorblock' differ in signedness
# aes.c: In function 'krb5int_aes_decrypt':
# aes.c:127: warning: pointer targets in passing argument 1 of 'krb5int_aes_dec_blk' differ in signedness
# aes.c:127: warning: pointer targets in passing argument 2 of 'krb5int_aes_dec_blk' differ in signedness
# aes.c:131: warning: pointer targets in passing argument 1 of 'krb5int_aes_dec_blk' differ in signedness
# aes.c:132: warning: pointer targets in passing argument 1 of 'xorblock' differ in signedness
# aes.c:132: warning: pointer targets in passing argument 2 of 'xorblock' differ in signedness
# aes.c:138: warning: pointer targets in passing argument 1 of 'krb5int_aes_dec_blk' differ in signedness
# aes.c:145: warning: pointer targets in passing argument 1 of 'xorblock' differ in signedness
# aes.c:145: warning: pointer targets in passing argument 2 of 'xorblock' differ in signedness
# aes.c:154: warning: pointer targets in passing argument 1 of 'xorblock' differ in signedness
# aes.c:154: warning: pointer targets in passing argument 2 of 'xorblock' differ in signedness
#
--- lib/crypto/enc_provider/aes.c
+++ lib/crypto/enc_provider/aes.c 2006/06/21 10:50:23
@@ -40,7 +40,7 @@
#define enc(OUT, IN, CTX) (aes_enc_blk((IN),(OUT),(CTX)) == aes_good ? (void) 0 : abort())
#define dec(OUT, IN, CTX) (aes_dec_blk((IN),(OUT),(CTX)) == aes_good ? (void) 0 : abort())
-static void xorblock(char *out, const char *in)
+static void xorblock(unsigned char *out, const unsigned char *in)
{
int z;
for (z = 0; z < BLOCK_SIZE; z++)
@@ -69,12 +69,12 @@
if (nblocks == 1) {
/* XXX Used for DK function. */
- enc(output->data, input->data, &ctx);
+ enc((unsigned char*)output->data, (unsigned char*)input->data, &ctx);
} else {
unsigned int nleft;
for (blockno = 0; blockno < nblocks - 2; blockno++) {
- xorblock(tmp, input->data + blockno * BLOCK_SIZE);
+ xorblock(tmp, (unsigned char*) input->data + blockno * BLOCK_SIZE);
enc(tmp2, tmp, &ctx);
memcpy(output->data + blockno * BLOCK_SIZE, tmp2, BLOCK_SIZE);
@@ -83,7 +83,7 @@
}
/* Do final CTS step for last two blocks (the second of which
may or may not be incomplete). */
- xorblock(tmp, input->data + (nblocks - 2) * BLOCK_SIZE);
+ xorblock(tmp, (unsigned char*) input->data + (nblocks - 2) * BLOCK_SIZE);
enc(tmp2, tmp, &ctx);
nleft = input->length - (nblocks - 1) * BLOCK_SIZE;
memcpy(output->data + (nblocks - 1) * BLOCK_SIZE, tmp2, nleft);
@@ -124,18 +124,18 @@
if (nblocks == 1) {
if (input->length < BLOCK_SIZE)
abort();
- dec(output->data, input->data, &ctx);
+ dec((unsigned char*)output->data, (unsigned char*) input->data, &ctx);
} else {
for (blockno = 0; blockno < nblocks - 2; blockno++) {
- dec(tmp2, input->data + blockno * BLOCK_SIZE, &ctx);
+ dec(tmp2, (unsigned char*)input->data + blockno * BLOCK_SIZE, &ctx);
xorblock(tmp2, tmp);
memcpy(output->data + blockno * BLOCK_SIZE, tmp2, BLOCK_SIZE);
memcpy(tmp, input->data + blockno * BLOCK_SIZE, BLOCK_SIZE);
}
/* Do last two blocks, the second of which (next-to-last block
of plaintext) may be incomplete. */
- dec(tmp2, input->data + (nblocks - 2) * BLOCK_SIZE, &ctx);
+ dec(tmp2, (unsigned char*) input->data + (nblocks - 2) * BLOCK_SIZE, &ctx);
/* Set tmp3 to last ciphertext block, padded. */
memset(tmp3, 0, sizeof(tmp3));
memcpy(tmp3, input->data + (nblocks - 1) * BLOCK_SIZE,
++++++ warning-fix-lib-crypto-yarrow_arcfour.dif ++++++
# warning fixes for:
# arcfour_s2k.c:46: warning: pointer targets in passing argument 2 of 'asctouni' differ in signedness
#
# ycipher.c:77: warning: pointer targets in assignment differ in signedness
#
--- lib/crypto/arcfour/arcfour_s2k.c
+++ lib/crypto/arcfour/arcfour_s2k.c 2006/06/21 10:55:47
@@ -43,7 +43,7 @@
return ENOMEM;
/* make the string. start by creating the unicode version of the password*/
- asctouni(copystr, string->data, slen );
+ asctouni(copystr, (unsigned char*)string->data, slen );
/* the actual MD4 hash of the data */
krb5_MD4Init(&md4_context);
--- lib/crypto/yarrow/ycipher.c
+++ lib/crypto/yarrow/ycipher.c 2006/06/21 10:56:48
@@ -74,7 +74,7 @@
const struct krb5_enc_provider *enc = &yarrow_enc_provider;
ind.data = (char *) in;
ind.length = CIPHER_BLOCK_SIZE;
- outd.data = out;
+ outd.data = (char*)out;
outd.length = CIPHER_BLOCK_SIZE;
ret = enc->encrypt (&ctx->key, 0, &ind, &outd);
if (ret)
++++++ warning-fix-lib-crypto.dif ++++++
# warning fix for:
# old_api_glue.c: In function 'krb5_encrypt':
# old_api_glue.c:49: warning: assignment discards qualifiers from pointer target type
# old_api_glue.c: In function 'krb5_decrypt':
# old_api_glue.c:85: warning: assignment discards qualifiers from pointer target type
# old_api_glue.c: In function 'krb5_calculate_checksum':
# old_api_glue.c:206: warning: assignment discards qualifiers from pointer target type
# old_api_glue.c:210: warning: assignment discards qualifiers from pointer target type
# old_api_glue.c: In function 'krb5_verify_checksum':
# old_api_glue.c:242: warning: assignment discards qualifiers from pointer target type
# old_api_glue.c:246: warning: assignment discards qualifiers from pointer target type
#
# pbkdf2.c:86: warning: pointer targets in assignment differ in signedness
#
# prng.c:33: warning: 'init_error' defined but not used
#
--- lib/crypto/old_api_glue.c
+++ lib/crypto/old_api_glue.c 2006/06/21 10:23:07
@@ -46,7 +46,7 @@
/* size is the length of the input cleartext data */
inputd.length = size;
- inputd.data = inptr;
+ inputd.data = (char*)inptr;
/* The size of the output buffer isn't part of the old api. Not too
safe. So, we assume here that it's big enough. */
@@ -82,7 +82,7 @@
/* size is the length of the input ciphertext data */
inputd.enctype = eblock->key->enctype;
inputd.ciphertext.length = size;
- inputd.ciphertext.data = inptr;
+ inputd.ciphertext.data = (char*)inptr;
/* we don't really know how big this is, but the code tends to assume
that the output buffer size should be the same as the input
@@ -203,11 +203,11 @@
krb5_error_code ret;
krb5_checksum cksum;
- input.data = in;
+ input.data = (char*)in;
input.length = in_length;
key.length = seed_length;
- key.contents = seed;
+ key.contents = (krb5_octet*)seed;
if ((ret = krb5_c_make_checksum(context, ctype, &key, 0, &input, &cksum)))
return(ret);
@@ -239,11 +239,11 @@
krb5_error_code ret;
krb5_boolean valid;
- input.data = in;
+ input.data = (char*)in;
input.length = in_length;
key.length = seed_length;
- key.contents = seed;
+ key.contents = (krb5_octet*)seed;
if ((ret = krb5_c_verify_checksum(context, &key, 0, &input, cksum,
&valid)))
--- lib/crypto/pbkdf2.c
+++ lib/crypto/pbkdf2.c 2006/06/21 10:25:54
@@ -83,7 +83,7 @@
krb5_data out;
krb5_error_code err;
- pdata.contents = pass->data;
+ pdata.contents = (krb5_octet*) pass->data;
pdata.length = pass->length;
#if 0
--- lib/crypto/prng.c
+++ lib/crypto/prng.c 2006/06/21 10:27:07
@@ -30,7 +30,6 @@
#include "yarrow.h"
static Yarrow_CTX y_ctx;
-static int init_error;
#define yarrow_lock krb5int_yarrow_lock
k5_mutex_t yarrow_lock = K5_MUTEX_PARTIAL_INITIALIZER;
++++++ warning-fix-util-support.dif ++++++
# threads.c: In function 'krb5int_thread_support_init':
# threads.c:456: warning: implicit declaration of function 'krb5int_err_init'
# errors.c: In function 'krb5int_vset_error':
# errors.c:52: warning: passing argument 1 of 'free' discards qualifiers from pointer target type
# errors.c:59: warning: implicit declaration of function 'vasprintf'
# errors.c: In function 'krb5int_get_error':
# errors.c:76: warning: assignment discards qualifiers from pointer target type
# errors.c:80: warning: implicit declaration of function 'krb5int_call_thread_support_init'
# errors.c:120: warning: assignment discards qualifiers from pointer target type
# errors.c: In function 'krb5int_clear_error':
# errors.c:146: warning: passing argument 2 of 'krb5int_free_error' discards qualifiers from pointer target type
#
--- util/support/errors.c
+++ util/support/errors.c 2006/06/21 07:36:30
@@ -31,6 +31,9 @@
{
return k5_mutex_finish_init (&krb5int_error_info_support_mutex);
}
+
+extern int krb5int_call_thread_support_init(void);
+
#define initialize() krb5int_call_thread_support_init()
#define lock() k5_mutex_lock(&krb5int_error_info_support_mutex)
#define unlock() k5_mutex_unlock(&krb5int_error_info_support_mutex)
@@ -49,7 +52,7 @@
const char *fmt, va_list args)
{
if (ep->msg && ep->msg != ep->scratch_buf) {
- free (ep->msg);
+ free ((char*)ep->msg);
ep->msg = NULL;
}
ep->code = code;
@@ -73,7 +76,7 @@
if (code != ep->code)
krb5int_clear_error (ep);
if (ep->msg) {
- r = ep->msg;
+ r = (char*)ep->msg;
ep->msg = NULL;
return r;
}
@@ -117,7 +120,7 @@
sprintf (ep->scratch_buf, _("error %ld"), code);
return ep->scratch_buf;
}
- r = fptr(code);
+ r = (char*)fptr(code);
if (r == NULL) {
unlock();
goto format_number;
@@ -143,7 +146,7 @@
void
krb5int_clear_error (struct errinfo *ep)
{
- krb5int_free_error (ep, ep->msg);
+ krb5int_free_error (ep, (char*)ep->msg);
ep->msg = NULL;
}
--- util/support/threads.c
+++ util/support/threads.c 2006/06/21 07:25:22
@@ -36,6 +36,8 @@
MAKE_INIT_FUNCTION(krb5int_thread_support_init);
MAKE_FINI_FUNCTION(krb5int_thread_support_fini);
+extern int krb5int_err_init(void);
+
#ifndef ENABLE_THREADS /* no thread support */
static void (*destructors[K5_KEY_MAX])(void *);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org