diff options
| author | Werner Koch <wk@gnupg.org> | 2001-05-28 21:12:27 +0000 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2001-05-28 21:12:27 +0000 |
| commit | 08e3fbb986bed2f39cc5dca806faca9654c3a6df (patch) | |
| tree | 8ff245903939d951c51b2c49b312074b91e94536 | |
| parent | 7e68abda362fce76e91631973d062fd7c8ff5e4e (diff) | |
| download | libgcrypt-08e3fbb986bed2f39cc5dca806faca9654c3a6df.tar.gz | |
Merged back some changes fron gnupg. Fixed doc building.
98 files changed, 1620 insertions, 1124 deletions
@@ -1,3 +1,9 @@ +2001-05-28 Werner Koch <wk@gnupg.org> + + * acinclude.m4 (GPH_PROG_DOCBOOK): Removed. + (GPH_PROG_DB2ANY): New. Taken from GPH. + * configure.in: Use it here. + 2000-12-19 Werner Koch <wk@gnupg.org> Major change: diff --git a/acinclude.m4 b/acinclude.m4 index 9dce2486..daf6a355 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -745,115 +745,36 @@ if test $gnupg_cv_mkdir_takes_one_arg = yes ; then fi ]) -dnl GPH_PROG_DOCBOOK() -dnl Check whether we have the needed Docbook environment + +dnl GPH_PROG_DB2ANY() +dnl Check whether we have the needed Docbook tools dnl and issue a warning if this is not the case. dnl dnl This test defines these variables for substitution: -dnl DB2HTML - command used to convert Docbook to HTML -dnl DB2TEX - command used to convert Docbook to TeX -dnl DB2MAN - command used to convert Docbook to man pages -dnl JADE - command to invoke jade -dnl JADETEX - command to invoke jadetex -dnl DSL_FOR_HTML - the stylesheet used to for the Docbook->HTML conversion -dnl The following make conditionals are defined -dnl HAVE_DB2MAN - defined when db2man is available -dnl HAVE_DB2TEX - defined when db2tex is available -dnl HAVE_DB2HTML - defined when db2html is available -dnl HAVE_DOCBOOK - defined when the entire Docbook environment is present -dnl HAVE_JADE - defined when jade is installed -dnl HAVE_JADETEX - defined when jadetex is installed +dnl DB2ANY - script used to render Docbook dnl -dnl (wk 2000-02-17) +dnl (wk 2000-05-16) dnl -AC_DEFUN(GPH_PROG_DOCBOOK, +AC_DEFUN(GPH_PROG_DB2ANY, [ AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl - all=yes - AC_PATH_PROG(DB2MAN, docbook-to-man, no) - test "$DB2MAN" = no && all=no - AM_CONDITIONAL(HAVE_DB2MAN, test "$DB2MAN" != no ) - - AC_PATH_PROG(JADE, jade, no) - test "$JADE" = no && all=no - AM_CONDITIONAL(HAVE_JADE, test "$JADE" != no ) - - AC_PATH_PROG(JADETEX, jadetex, no) - test "$JADETEX" = no && all=no - AM_CONDITIONAL(HAVE_JADETEX, test "$JADETEX" != no ) - - stylesheet_dirs=' -/usr/local/lib/dsssl/stylesheets/docbook -/usr/local/share/dsssl/stylesheets/docbook -/usr/local/lib/sgml/stylesheet/dsssl/docbook/nwalsh -/usr/local/share/sgml/stylesheet/dsssl/docbook/nwalsh -/usr/lib/dsssl/stylesheets/docbook -/usr/share/dsssl/stylesheets/docbook -/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh -/usr/share/sgml/stylesheet/dsssl/docbook/nwalsh -' - - AC_MSG_CHECKING(for TeX stylesheet) - dsl=none - for d in ${stylesheet_dirs}; do - file=${d}/print/docbook.dsl - if test -f $file; then - dsl=$file - break - fi - done - AC_MSG_RESULT([$dsl]) - okay=no - if test $dsl = none ; then - DB2TEX="$missing_dir/missing db2tex" - all=no - else - DB2TEX="$JADE -t tex -i tex -d $dsl" - okay=yes - fi - AC_SUBST(DB2TEX) - AM_CONDITIONAL(HAVE_DB2TEX, test $okay = yes ) - - if ( $ac_aux_dir/db2html.in --version) < /dev/null > /dev/null 2>&1; then - : - else - AC_ERROR([needed $ac_aux_dir/db2html.in not found]) - fi - - AC_MSG_CHECKING(for HTML stylesheet) - DSL_FOR_HTML="none" - for d in ${stylesheet_dirs}; do - file=${d}/html/docbook.dsl - if test -f $file; then - DSL_FOR_HTML=$file - break - fi - done - AC_MSG_RESULT([$DSL_FOR_HTML]) - okay=no - if test $DSL_FOR_HTML = none ; then - DB2HTML="$missing_dir/missing db2html" - all=no - else - DB2HTML="`cd $ac_aux_dir && pwd`/db2html --copyfiles" - okay=yes - fi - AC_SUBST(DB2HTML) - AC_SUBST(DSL_FOR_HTML) - AM_CONDITIONAL(HAVE_DB2HTML, test $okay = yes ) - - AM_CONDITIONAL(HAVE_DOCBOOK, test "$all" != yes ) - if test $all = no ; then - AC_MSG_WARN([[ + working_db2any=no + if $ac_aux_dir/db2any --systemcheck; then + working_db2any=yes + DB2ANY=`cd $ac_aux_dir && pwd`/db2any + else + DB2ANY=": " + AC_MSG_WARN([[ *** *** It seems that the Docbook environment is not installed as required. *** We will try to build everything, but if you either touch some files *** or use a bogus make tool, you may run into problems. *** Docbook is normally only needed to build the documentation. +*** To further investigate the problem you can run the command +*** $ac_aux_dir/db2any --systemcheck --verbose ***]]) fi + AC_SUBST(DB2ANY) + AM_CONDITIONAL(WORKING_DB2ANY, test "$working_db2any" != yes ) ]) - - -dnl *-*wedit:notab*-* Please keep this as the last line. diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 1822f02e..59367d4d 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,7 @@ +2001-05-28 Werner Koch <wk@gnupg.org> + + * rndegd.c (gather_random): Removed the use of tty_printf. + 2001-03-29 Werner Koch <wk@gnupg.org> * md5.c (md5_final): Fixed calculation of hashed length. Thanks diff --git a/cipher/rndegd.c b/cipher/rndegd.c index a18856d8..25b789ad 100644 --- a/cipher/rndegd.c +++ b/cipher/rndegd.c @@ -32,9 +32,6 @@ #include <sys/un.h> #include "types.h" #include "g10lib.h" -#ifndef IS_MODULE -#include "ttyio.h" -#endif #include "dynload.h" #include "cipher.h" @@ -195,11 +192,7 @@ gather_random( void (*add)(const void*, size_t, int), int requester, } if( length ) { - #ifdef IS_MODULE fprintf( stderr, - #else - tty_printf( - #endif _("Please wait, entropy is being gathered. Do some work if it would\n" "keep you from getting bored, because it will improve the quality\n" "of the entropy.\n") ); diff --git a/configure.in b/configure.in index 6f8c51f9..e5adf9ac 100644 --- a/configure.in +++ b/configure.in @@ -165,7 +165,7 @@ AC_PROG_CPP AC_ISC_POSIX AC_PROG_INSTALL AC_PROG_AWK -GPH_PROG_DOCBOOK +GPH_PROG_DB2ANY AM_DISABLE_STATIC AM_PROG_LIBTOOL @@ -679,7 +679,7 @@ AC_SUBST(LIBGCRYPT_LIBS) AC_SUBST(LIBGCRYPT_CFLAGS) AC_OUTPUT_COMMANDS([ -chmod +x scripts/db2html +chmod +x scripts/db2any chmod +x src/libgcrypt-config cat >gcrypt-defs.tmp <<G10EOF /* Generated automatically by configure */ @@ -718,7 +718,6 @@ DATADIRNAME=$DATADIRNAME AC_OUTPUT([ Makefile -scripts/db2html jnlib/Makefile mpi/Makefile cipher/Makefile diff --git a/doc/Makefile.am b/doc/Makefile.am index 12289f77..af75204a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,41 +1,31 @@ ## Process this file with automake to create Makefile.in -BUILT_SOURCES = version.sgml reference.html reference.ps +sgml_source = reference.sgml \ + cipher-ref.sgml digest-ref.sgml misc-ref.sgml pubkey-ref.sgml +EXTRA_DIST = $(sgml_source) version.sgml.in \ + reference.dvi reference.html reference.ps reference.texi -#EXTRA_DIST = version.sgml.in $(BUILT_SOURCES) - -# pkgdata_DATA = reference.html reference.ps - +pkgdata_DATA = reference.dvi reference.ps reference.html reference.texi +BUILT_SOURCES = version.sgml \ + reference.dvi reference.html reference.ps reference.texi CLEANFILES = reference.aux reference.log reference.tex reference.dvi +reference.sgml : version.sgml -# reference.sgml : version.sgml - - -if HAVE_DB2MAN -%.1 : %.sgml - $(DB2MAN) $< >$@ -endif -if HAVE_DB2TEX %.ps : %.dvi dvips -o $@ $< -%.tex : %.sgml - $(DB2TEX) -V generate-book-toc $< > $@ +# we might want something like this: -V generate-book-toc +# or use a custom stylesheet. +%.dvi : %.sgml + $(DB2ANY) --mode dvi $< -%.dvi : %.tex - $(JADETEX) $< -endif - -if HAVE_DB2HTML %.html : %.sgml - $(DB2HTML) --nosplit $< -endif - - - + $(DB2ANY) --mode html $< +%.texi : %.sgml + $(DB2ANY) --mode texinfo $< diff --git a/mpi/ChangeLog b/mpi/ChangeLog index a9ce8dea..2730fb1b 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,14 @@ +2001-05-28 Werner Koch <wk@gnupg.org> + + * mpicoder.c (mpi_fromstr): Made static and assume that all input + is in hexformat. + + Updated all CPU specific code with the one from GnuPG-1.0.5. This + is just a change of text formatting and the use of .label + instead of labels for hppa and pa7100. + + * longlong.h: Fixes for ARM by Phil Blundell. + 2001-03-29 Werner Koch <wk@gnupg.org> * mpi-mul.c (mpi_mul): Make sure that secret temporary results are diff --git a/mpi/alpha/mpih-add1.S b/mpi/alpha/mpih-add1.S index dc3bcfbb..a2ee8eb1 100644 --- a/mpi/alpha/mpih-add1.S +++ b/mpi/alpha/mpih-add1.S @@ -1,17 +1,15 @@ /* alpha add_n -- Add two limb vectors of the same length > 0 and store * sum in a third limb vector. + * Copyright (C) 1995, 1998, 2001 Free Software Foundation, Inc. * - * Copyright (C) 1995 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. + * This file is part of GnuPG. * - * This file is part of GNUPG. - * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/alpha/mpih-lshift.S b/mpi/alpha/mpih-lshift.S index 9688588f..4ce4879a 100644 --- a/mpi/alpha/mpih-lshift.S +++ b/mpi/alpha/mpih-lshift.S @@ -1,15 +1,16 @@ -/* alpha lshift - * Copyright (C) 1994, 1995 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. +/* alpha - left shift * - * This file is part of GNUPG. + * Copyright (C) 1994, 1995, 1998, 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/alpha/mpih-mul1.S b/mpi/alpha/mpih-mul1.S index 5b24d98d..e62ccbdb 100644 --- a/mpi/alpha/mpih-mul1.S +++ b/mpi/alpha/mpih-mul1.S @@ -1,16 +1,17 @@ /* Alpha 21064 mpih-mul1.S -- Multiply a limb vector with a limb and store * the result in a second limb vector. * - * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1995, 1998, + 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/alpha/mpih-mul2.S b/mpi/alpha/mpih-mul2.S index 0c8d361c..595af99d 100644 --- a/mpi/alpha/mpih-mul2.S +++ b/mpi/alpha/mpih-mul2.S @@ -1,16 +1,17 @@ /* Alpha 21064 addmul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. * - * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1995, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/alpha/mpih-mul3.S b/mpi/alpha/mpih-mul3.S index bdf16b57..fa3df92a 100644 --- a/mpi/alpha/mpih-mul3.S +++ b/mpi/alpha/mpih-mul3.S @@ -1,15 +1,16 @@ /* Alpha 21064 submul_1 -- Multiply a limb vector with a limb and * subtract the result from a second limb vector. - * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1995, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/alpha/mpih-rshift.S b/mpi/alpha/mpih-rshift.S index e93315ae..e15542de 100644 --- a/mpi/alpha/mpih-rshift.S +++ b/mpi/alpha/mpih-rshift.S @@ -1,6 +1,6 @@ /* alpha rshift - * Copyright (C) 1994, 1995 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1994, 1995, 1998, 1999, + * 2000, 2001 Free Software Foundation, Inc. * * This file is part of GNUPG. * diff --git a/mpi/alpha/mpih-sub1.S b/mpi/alpha/mpih-sub1.S index bf614309..a32b470e 100644 --- a/mpi/alpha/mpih-sub1.S +++ b/mpi/alpha/mpih-sub1.S @@ -1,15 +1,16 @@ /* Alpha sub_n -- Subtract two limb vectors of the same length > 0 and * store difference in a third limb vector. - * Copyright (C) 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1995, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/alpha/udiv-qrnnd.S b/mpi/alpha/udiv-qrnnd.S index 487991cd..0079c3ca 100644 --- a/mpi/alpha/udiv-qrnnd.S +++ b/mpi/alpha/udiv-qrnnd.S @@ -1,16 +1,16 @@ /* Alpha 21064 __udiv_qrnnd * - * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1992, 1994, 1995, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GnuPG. * - * G10 is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * G10 is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/generic/mpi-asm-defs.h b/mpi/generic/mpi-asm-defs.h index 3bd1b611..13424e28 100644 --- a/mpi/generic/mpi-asm-defs.h +++ b/mpi/generic/mpi-asm-defs.h @@ -6,3 +6,5 @@ + + diff --git a/mpi/generic/mpih-add1.c b/mpi/generic/mpih-add1.c index e66c6686..d9c3cbb6 100644 --- a/mpi/generic/mpih-add1.c +++ b/mpi/generic/mpih-add1.c @@ -1,15 +1,15 @@ /* mpihelp-add_1.c - MPI helper functions - * Copyright (c) 1997 by Werner Koch (dd9jn) - * Copyright (C) 1994, 1996 Free Software Foundation, Inc. + * Copyright (C) 1994, 1996, 1997, 1998, + * 2000 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GnuPG. * - * G10 is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * G10 is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/generic/mpih-lshift.c b/mpi/generic/mpih-lshift.c index 698cd38d..fba8c052 100644 --- a/mpi/generic/mpih-lshift.c +++ b/mpi/generic/mpih-lshift.c @@ -1,14 +1,14 @@ /* mpihelp-lshift.c - MPI helper functions - * Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc. + * Copyright (C) 1994, 1996, 1998, 2001 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GnuPG. * - * G10 is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * G10 is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/generic/mpih-mul1.c b/mpi/generic/mpih-mul1.c index e84eccce..83a81add 100644 --- a/mpi/generic/mpih-mul1.c +++ b/mpi/generic/mpih-mul1.c @@ -1,15 +1,14 @@ /* mpihelp-mul_1.c - MPI helper functions - * Copyright (c) 1997 by Werner Koch (dd9jn) - * Copyright (C) 1994, 1996 Free Software Foundation, Inc. + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GnuPG. * - * G10 is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * G10 is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/generic/mpih-mul2.c b/mpi/generic/mpih-mul2.c index d77ec802..ff8f998f 100644 --- a/mpi/generic/mpih-mul2.c +++ b/mpi/generic/mpih-mul2.c @@ -1,15 +1,14 @@ /* mpihelp-mul_2.c - MPI helper functions - * Copyright (c) 1997 by Werner Koch (dd9jn) - * Copyright (C) 1994, 1996 Free Software Foundation, Inc. + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GnuPG. * - * G10 is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * G10 is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/generic/mpih-mul3.c b/mpi/generic/mpih-mul3.c index c7c4e189..80eedcc4 100644 --- a/mpi/generic/mpih-mul3.c +++ b/mpi/generic/mpih-mul3.c @@ -1,15 +1,14 @@ /* mpihelp-mul_3.c - MPI helper functions - * Copyright (c) 1997 by Werner Koch (dd9jn) - * Copyright (C) 1994, 1996 Free Software Foundation, Inc. + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GnuPG. * - * G10 is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * G10 is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/generic/mpih-rshift.c b/mpi/generic/mpih-rshift.c index d8ca35f1..be73adfb 100644 --- a/mpi/generic/mpih-rshift.c +++ b/mpi/generic/mpih-rshift.c @@ -1,5 +1,6 @@ /* mpih-rshift.c - MPI helper functions - * Copyright (C) 1994, 1996, 1998 Free Software Foundation, Inc. + * Copyright (C) 1994, 1996, 1998, 1999, + * 2000, 2001 Free Software Foundation, Inc. * * This file is part of GNUPG * diff --git a/mpi/generic/mpih-sub1.c b/mpi/generic/mpih-sub1.c index 2c38ff06..c618fee4 100644 --- a/mpi/generic/mpih-sub1.c +++ b/mpi/generic/mpih-sub1.c @@ -1,15 +1,14 @@ /* mpihelp-add_2.c - MPI helper functions - * Copyright (c) 1997 by Werner Koch (dd9jn) - * Copyright (C) 1994, 1996 Free Software Foundation, Inc. + * Copyright (C) 1994, 1996, 1997, 1998, 2001 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GnuPG. * - * G10 is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * G10 is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/generic/udiv-w-sdiv.c b/mpi/generic/udiv-w-sdiv.c index 1e9e79d2..dd028503 100644 --- a/mpi/generic/udiv-w-sdiv.c +++ b/mpi/generic/udiv-w-sdiv.c @@ -1,18 +1,16 @@ /* mpihelp_udiv_w_sdiv -- implement udiv_qrnnd on machines with only signed * division. - * - * Contributed by Peter L. Montgomery. - * * Copyright (C) 1992, 1994, 1996, 1998 Free Software Foundation, Inc. + * Contributed by Peter L. Montgomery. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/hppa/mpih-add1.S b/mpi/hppa/mpih-add1.S index e01c2eed..7a2a2c2c 100644 --- a/mpi/hppa/mpih-add1.S +++ b/mpi/hppa/mpih-add1.S @@ -1,17 +1,17 @@ /* hppa add_n -- Add two limb vectors of the same length > 0 and store * sum in a third limb vector. * - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1998, + * 2001 Fee Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -45,7 +45,7 @@ .code .export mpihelp_add_n -mpihelp_add_n + .label mpihelp_add_n .proc .callinfo frame=0,no_calls .entry @@ -56,13 +56,15 @@ mpihelp_add_n addib,= -1,%r23,L$end ; check for (SIZE == 1) add %r20,%r19,%r28 ; add first limbs ignoring cy -L$loop ldws,ma 4(0,%r25),%r20 + .label L$loop + ldws,ma 4(0,%r25),%r20 ldws,ma 4(0,%r24),%r19 stws,ma %r28,4(0,%r26) addib,<> -1,%r23,L$loop addc %r20,%r19,%r28 -L$end stws %r28,0(0,%r26) + .label L$end + stws %r28,0(0,%r26) bv 0(%r2) addc %r0,%r0,%r28 diff --git a/mpi/hppa/mpih-lshift.S b/mpi/hppa/mpih-lshift.S index ada09f59..6a8b2c4c 100644 --- a/mpi/hppa/mpih-lshift.S +++ b/mpi/hppa/mpih-lshift.S @@ -1,15 +1,16 @@ /* hppa lshift -* - * Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998 + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -31,7 +32,7 @@ .code .export mpihelp_lshift -mpihelp_lshift + .label mpihelp_lshift .proc .callinfo frame=64,no_calls .entry @@ -47,7 +48,8 @@ mpihelp_lshift addib,= -1,%r24,L$0002 vshd %r22,%r29,%r20 -L$loop ldws,mb -4(0,%r25),%r22 + .label L$loop + ldws,mb -4(0,%r25),%r22 stws,mb %r20,-4(0,%r26) addib,= -1,%r24,L$0003 vshd %r29,%r22,%r20 @@ -56,12 +58,15 @@ L$loop ldws,mb -4(0,%r25),%r22 addib,<> -1,%r24,L$loop vshd %r22,%r29,%r20 -L$0002 stws,mb %r20,-4(0,%r26) + .label L$0002 + stws,mb %r20,-4(0,%r26) vshd %r29,%r0,%r20 bv 0(%r2) stw %r20,-4(0,%r26) -L$0003 stws,mb %r20,-4(0,%r26) -L$0004 vshd %r22,%r0,%r20 + .label L$0003 + stws,mb %r20,-4(0,%r26) + .label L$0004 + vshd %r22,%r0,%r20 bv 0(%r2) stw %r20,-4(0,%r26) diff --git a/mpi/hppa/mpih-rshift.S b/mpi/hppa/mpih-rshift.S index 0299d2e2..b1e6a679 100644 --- a/mpi/hppa/mpih-rshift.S +++ b/mpi/hppa/mpih-rshift.S @@ -1,15 +1,16 @@ /* hppa rshift -* - * Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -32,7 +33,7 @@ .code .export mpihelp_rshift -mpihelp_rshift + .label mpihelp_rshift .proc .callinfo frame=64,no_calls .entry @@ -45,7 +46,8 @@ mpihelp_rshift addib,= -1,%r24,L$r002 vshd %r29,%r22,%r20 -L$roop ldws,ma 4(0,%r25),%r22 + .label L$roop + ldws,ma 4(0,%r25),%r22 stws,ma %r20,4(0,%r26) addib,= -1,%r24,L$r003 vshd %r22,%r29,%r20 @@ -54,12 +56,15 @@ L$roop ldws,ma 4(0,%r25),%r22 addib,<> -1,%r24,L$roop vshd %r29,%r22,%r20 -L$r002 stws,ma %r20,4(0,%r26) + .label L$r002 + stws,ma %r20,4(0,%r26) vshd %r0,%r29,%r20 bv 0(%r2) stw %r20,0(0,%r26) -L$r003 stws,ma %r20,4(0,%r26) -L$r004 vshd %r0,%r22,%r20 + .label L$r003 + stws,ma %r20,4(0,%r26) + .label L$r004 + vshd %r0,%r22,%r20 bv 0(%r2) stw %r20,0(0,%r26) diff --git a/mpi/hppa/mpih-sub1.S b/mpi/hppa/mpih-sub1.S index 8672e314..870009e9 100644 --- a/mpi/hppa/mpih-sub1.S +++ b/mpi/hppa/mpih-sub1.S @@ -1,16 +1,17 @@ /* hppa sub_n -- Sub two limb vectors of the same length > 0 and store * sum in a third limb vector. - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -48,7 +49,7 @@ .code .export mpihelp_sub_n -mpihelp_sub_n + .label mpihelp_sub_n .proc .callinfo frame=0,no_calls .entry @@ -59,13 +60,15 @@ mpihelp_sub_n addib,= -1,%r23,L$end ; check for (SIZE == 1) sub %r20,%r19,%r28 ; subtract first limbs ignoring cy -L$loop ldws,ma 4(0,%r25),%r20 + .label L$loop + ldws,ma 4(0,%r25),%r20 ldws,ma 4(0,%r24),%r19 stws,ma %r28,4(0,%r26) addib,<> -1,%r23,L$loop subb %r20,%r19,%r28 -L$end stws %r28,0(0,%r26) + .label L$end + stws %r28,0(0,%r26) addc %r0,%r0,%r28 bv 0(%r2) subi 1,%r28,%r28 diff --git a/mpi/hppa/udiv-qrnnd.S b/mpi/hppa/udiv-qrnnd.S index 84923834..c8a52412 100644 --- a/mpi/hppa/udiv-qrnnd.S +++ b/mpi/hppa/udiv-qrnnd.S @@ -1,17 +1,16 @@ /* HP-PA __udiv_qrnnd division support, used from longlong.h. * This version runs fast on pre-PA7000 CPUs. * - * Copyright (C) 1993, 1994 Free Software Foundation, Inc. - * Copyright (c) 1997 by Werner Koch (dd9jn) + * Copyright (C) 1993, 1994, 1998, 2001 Free Software Foundation, Inc. * - * This file is part of G10. + * This file is part of GnuPG. * - * G10 is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * G10 is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -44,7 +43,7 @@ .code .export __udiv_qrnnd -__udiv_qrnnd + .label __udiv_qrnnd .proc .callinfo frame=0,no_calls .entry @@ -122,7 +121,7 @@ __udiv_qrnnd bv 0(%r2) addc %r28,%r28,%r28 -L$largedivisor + .label L$largedivisor extru %r24,31,1,%r19 ; r19 = n0 & 1 bb,< %r23,31,L$odd extru %r23,30,31,%r22 ; r22 = d >> 1 @@ -201,7 +200,8 @@ L$largedivisor bv 0(%r2) addc %r24,%r24,%r28 -L$odd addib,sv,n 1,%r22,L$FF.. ; r22 = (d / 2 + 1) + .label L$odd + addib,sv,n 1,%r22,L$FF.. ; r22 = (d / 2 + 1) shd %r25,%r24,1,%r24 ; r24 = new n0 extru %r25,30,31,%r25 ; r25 = new n1 sub %r0,%r22,%r21 @@ -286,7 +286,8 @@ L$odd addib,sv,n 1,%r22,L$FF.. ; r22 = (d / 2 + 1) ; This is just a special case of the code above. ; We come here when d == 0xFFFFFFFF -L$FF.. add,uv %r25,%r24,%r24 + .label L$FF.. + add,uv %r25,%r24,%r24 sub,<< %r24,%r23,%r0 ldo 1(%r24),%r24 stws %r24,0(0,%r26) diff --git a/mpi/hppa1.1/mpih-mul1.S b/mpi/hppa1.1/mpih-mul1.S index 1f737747..ac9baced 100644 --- a/mpi/hppa1.1/mpih-mul1.S +++ b/mpi/hppa1.1/mpih-mul1.S @@ -1,16 +1,17 @@ /* hppa1.1 mul_1 -- Multiply a limb vector with a limb and store * the result in a second limb vector. - * Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1993, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -58,7 +59,7 @@ .code .export mpihelp_mul_1 -mpihelp_mul_1 + .label mpihelp_mul_1 .proc .callinfo frame=64,no_calls .entry @@ -81,7 +82,8 @@ mpihelp_mul_1 ldw -12(%r30),%r1 ; Main loop -L$loop fldws,ma 4(%r25),%fr5 + .label L$loop + fldws,ma 4(%r25),%fr5 stws,ma %r19,4(%r26) addc %r28,%r1,%r19 xmpyu %fr4,%fr5,%fr6 @@ -90,7 +92,8 @@ L$loop fldws,ma 4(%r25),%fr5 addib,<> -1,%r24,L$loop ldw -12(%r30),%r1 -L$end stws,ma %r19,4(%r26) + .label L$end + stws,ma %r19,4(%r26) addc %r28,%r1,%r19 ldw -16(%r30),%r28 stws,ma %r19,4(%r26) @@ -98,7 +101,7 @@ L$end stws,ma %r19,4(%r26) bv 0(%r2) ldo -64(%r30),%r30 -L$just_one_limb + .label L$just_one_limb xmpyu %fr4,%fr5,%fr6 fstds %fr6,-16(%r30) ldw -16(%r30),%r28 diff --git a/mpi/hppa1.1/mpih-mul2.S b/mpi/hppa1.1/mpih-mul2.S index 89c02595..c73397e3 100644 --- a/mpi/hppa1.1/mpih-mul2.S +++ b/mpi/hppa1.1/mpih-mul2.S @@ -1,16 +1,17 @@ /* hppa1.1 addmul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. - * Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1993, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -48,7 +49,7 @@ .code .export mpihelp_addmul_1 -mpihelp_addmul_1 + .label mpihelp_addmul_1 .proc .callinfo frame=64,no_calls .entry @@ -71,7 +72,8 @@ mpihelp_addmul_1 ldw -12(%r30),%r1 ; Main loop -L$loop ldws 0(%r26),%r29 + .label L$loop + ldws 0(%r26),%r29 fldws,ma 4(%r25),%fr5 add %r29,%r19,%r19 stws,ma %r19,4(%r26) @@ -83,7 +85,8 @@ L$loop ldws 0(%r26),%r29 addib,<> -1,%r24,L$loop ldw -12(%r30),%r1 -L$end ldw 0(%r26),%r29 + .label L$end + ldw 0(%r26),%r29 add %r29,%r19,%r19 stws,ma %r19,4(%r26) addc %r28,%r1,%r19 @@ -96,7 +99,7 @@ L$end ldw 0(%r26),%r29 bv 0(%r2) ldo -64(%r30),%r30 -L$just_one_limb + .label L$just_one_limb xmpyu %fr4,%fr5,%fr6 ldw 0(%r26),%r29 fstds %fr6,-16(%r30) diff --git a/mpi/hppa1.1/mpih-mul3.S b/mpi/hppa1.1/mpih-mul3.S index 80868a3e..f9ccb1b5 100644 --- a/mpi/hppa1.1/mpih-mul3.S +++ b/mpi/hppa1.1/mpih-mul3.S @@ -1,16 +1,17 @@ /* hppa1.1 submul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. - * Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1993, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -55,7 +56,7 @@ .code .export mpihelp_submul_1 -mpihelp_submul_1 + .label mpihelp_submul_1 .proc .callinfo frame=64,no_calls .entry @@ -78,7 +79,8 @@ mpihelp_submul_1 ldw -12(%r30),%r1 ; Main loop -L$loop ldws 0(%r26),%r29 + .label L$loop + ldws 0(%r26),%r29 fldws,ma 4(%r25),%fr5 sub %r29,%r19,%r22 add %r22,%r19,%r0 @@ -91,7 +93,8 @@ L$loop ldws 0(%r26),%r29 addib,<> -1,%r24,L$loop ldw -12(%r30),%r1 -L$end ldw 0(%r26),%r29 + .label L$end + ldw 0(%r26),%r29 sub %r29,%r19,%r22 add %r22,%r19,%r0 stws,ma %r22,4(%r26) @@ -106,7 +109,7 @@ L$end ldw 0(%r26),%r29 bv 0(%r2) ldo -64(%r30),%r30 -L$just_one_limb + .label L$just_one_limb xmpyu %fr4,%fr5,%fr6 ldw 0(%r26),%r29 fstds %fr6,-16(%r30) diff --git a/mpi/hppa1.1/udiv-qrnnd.S b/mpi/hppa1.1/udiv-qrnnd.S index b48eee49..a1643d70 100644 --- a/mpi/hppa1.1/udiv-qrnnd.S +++ b/mpi/hppa1.1/udiv-qrnnd.S @@ -1,17 +1,17 @@ /* HP-PA __udiv_qrnnd division support, used from longlong.h. * This version runs fast on PA 7000 and later. * - * Copyright (C) 1993, 1994 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1993, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -39,10 +39,11 @@ */ .code -L$0000 .word 0x43f00000 + .label L$0000 + .word 0x43f00000 .word 0x0 .export __udiv_qrnnd -__udiv_qrnnd + .label __udiv_qrnnd .proc .callinfo frame=64,no_calls .entry @@ -58,7 +59,7 @@ __udiv_qrnnd fcnvxf,dbl,dbl %fr5,%fr5 fldds 0(0,%r19),%fr4 fadd,dbl %fr4,%fr5,%fr5 -L$1 + .label L$1 fcpy,sgl %fr0,%fr6L fldws -12(0,%r30),%fr6R fcnvxf,dbl,dbl %fr6,%fr4 @@ -79,7 +80,8 @@ L$1 add %r22,%r23,%r22 ldo -1(%r28),%r28 -L$2 bv 0(%r2) + .label L$2 + bv 0(%r2) stws %r22,0(0,%r26) .exit diff --git a/mpi/i386/mpih-add1.S b/mpi/i386/mpih-add1.S index b7517cf0..3b3b23c8 100644 --- a/mpi/i386/mpih-add1.S +++ b/mpi/i386/mpih-add1.S @@ -1,17 +1,17 @@ /* i80386 add_n -- Add two limb vectors of the same length > 0 and store * sum in a third limb vector. * - * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1995, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i386/mpih-lshift.S b/mpi/i386/mpih-lshift.S index a84f6b1f..5e6387a4 100644 --- a/mpi/i386/mpih-lshift.S +++ b/mpi/i386/mpih-lshift.S @@ -1,15 +1,15 @@ /* i80386 lshift - * Copyright (C) 1998 Free Software Foundation, Inc. - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i386/mpih-mul1.S b/mpi/i386/mpih-mul1.S index 10679643..cf87046f 100644 --- a/mpi/i386/mpih-mul1.S +++ b/mpi/i386/mpih-mul1.S @@ -1,16 +1,16 @@ /* i80386 mul_1 -- Multiply a limb vector with a limb and store * the result in a second limb vector. - * Copyright (C) 1998 Free Software Foundation, Inc. - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i386/mpih-mul2.S b/mpi/i386/mpih-mul2.S index 8b124bda..f134af70 100644 --- a/mpi/i386/mpih-mul2.S +++ b/mpi/i386/mpih-mul2.S @@ -1,16 +1,17 @@ /* i80386 addmul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. - * Copyright (C) 1998 Free Software Foundation, Inc. - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i386/mpih-mul3.S b/mpi/i386/mpih-mul3.S index 5f365561..2907ed03 100644 --- a/mpi/i386/mpih-mul3.S +++ b/mpi/i386/mpih-mul3.S @@ -1,16 +1,17 @@ /* i80386 submul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. - * Copyright (C) 1998 Free Software Foundation, Inc. - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i386/mpih-rshift.S b/mpi/i386/mpih-rshift.S index 3dd9caf7..9718204c 100644 --- a/mpi/i386/mpih-rshift.S +++ b/mpi/i386/mpih-rshift.S @@ -1,15 +1,16 @@ /* i80386 rshift - * Copyright (C) 1998 Free Software Foundation, Inc. - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i386/mpih-sub1.S b/mpi/i386/mpih-sub1.S index fe1cdeee..169c5395 100644 --- a/mpi/i386/mpih-sub1.S +++ b/mpi/i386/mpih-sub1.S @@ -1,16 +1,17 @@ /* i80386 sub_n -- Sub two limb vectors of the same length > 0 and store * sum in a third limb vector. - * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1995, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i386/syntax.h b/mpi/i386/syntax.h index 33bd2947..5a2c7b23 100644 --- a/mpi/i386/syntax.h +++ b/mpi/i386/syntax.h @@ -1,24 +1,30 @@ -/* asm.h -- Definitions for x86 syntax variations. - -Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. - -This file is part of the GNU MP Library. - -The GNU MP Library is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -The GNU MP Library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -License for more details. - -You should have received a copy of the GNU Library General Public License -along with the GNU MP Library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -MA 02111-1307, USA. */ - +/* syntax.h -- Definitions for x86 syntax variations. + * + * Copyright (C) 1992, 1994, 1995, 1998, + * 2001 Free Software Foundation, Inc. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ #undef ALIGN diff --git a/mpi/i586/mpih-add1.S b/mpi/i586/mpih-add1.S index a52c1646..248b0c0b 100644 --- a/mpi/i586/mpih-add1.S +++ b/mpi/i586/mpih-add1.S @@ -1,16 +1,17 @@ /* i80586 add_n -- Add two limb vectors of the same length > 0 and store * sum in a third limb vector. * - * Copyright (C) 1992, 1994, 1995, 1996 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1995, 1996, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i586/mpih-lshift.S b/mpi/i586/mpih-lshift.S index 9e0cb029..ed040912 100644 --- a/mpi/i586/mpih-lshift.S +++ b/mpi/i586/mpih-lshift.S @@ -1,15 +1,16 @@ /* i80586 lshift - * Copyright (C) 1998 Free Software Foundation, Inc. - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i586/mpih-mul1.S b/mpi/i586/mpih-mul1.S index b338b1a8..42bcde6b 100644 --- a/mpi/i586/mpih-mul1.S +++ b/mpi/i586/mpih-mul1.S @@ -1,15 +1,17 @@ /* i80586 mul_1 -- Multiply a limb vector with a limb and store * the result in a second limb vector. - * Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1996, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i586/mpih-mul2.S b/mpi/i586/mpih-mul2.S index df22a428..54c5df96 100644 --- a/mpi/i586/mpih-mul2.S +++ b/mpi/i586/mpih-mul2.S @@ -1,16 +1,17 @@ /* i80586 addmul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. - * Copyright (C) 1998 Free Software Foundation, Inc. - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i586/mpih-mul3.S b/mpi/i586/mpih-mul3.S index 014e33cb..0d61ff26 100644 --- a/mpi/i586/mpih-mul3.S +++ b/mpi/i586/mpih-mul3.S @@ -1,16 +1,17 @@ /* i80586 submul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. - * Copyright (C) 1998 Free Software Foundation, Inc. - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i586/mpih-rshift.S b/mpi/i586/mpih-rshift.S index aec26e64..2e331621 100644 --- a/mpi/i586/mpih-rshift.S +++ b/mpi/i586/mpih-rshift.S @@ -1,15 +1,16 @@ /* i80586 rshift - * Copyright (C) 1998 Free Software Foundation, Inc. - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/i586/mpih-sub1.S b/mpi/i586/mpih-sub1.S index 2ed704e8..a54be0e9 100644 --- a/mpi/i586/mpih-sub1.S +++ b/mpi/i586/mpih-sub1.S @@ -1,16 +1,17 @@ /* i80586 sub_n -- Sub two limb vectors of the same length > 0 and store * sum in a third limb vector. - * Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1995, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/longlong.h b/mpi/longlong.h index e36beae4..84020773 100644 --- a/mpi/longlong.h +++ b/mpi/longlong.h @@ -1,7 +1,8 @@ /* longlong.h -- definitions for mixed size 32/64 bit arithmetic. - Note: I added some stuff for use with g10 + Note: I added some stuff for use with gnupg -Copyright (C) 1991, 1992, 1993, 1994, 1996 Free Software Foundation, Inc. +Copyright (C) 1991, 1992, 1993, 1994, 1996, 1998, + 2000, 2001 Free Software Foundation, Inc. This file is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by @@ -199,28 +200,27 @@ extern UDItype __udiv_qrnnd (); "rI" ((USItype)(bh)), \ "r" ((USItype)(al)), \ "rI" ((USItype)(bl))) -#ifdef __ARM_ARCH_3__ -/* SAM This does not work on arm4 */ +#if defined __ARM_ARCH_2__ || defined __ARM_ARCH_3__ #define umul_ppmm(xh, xl, a, b) \ __asm__ ("%@ Inlined umul_ppmm - mov %|r0, %2, lsr #16 - mov %|r2, %3, lsr #16 - bic %|r1, %2, %|r0, lsl #16 - bic %|r2, %3, %|r2, lsl #16 - mul %1, %|r1, %|r2 - mul %|r2, %|r0, %|r2 - mul %|r1, %0, %|r1 - mul %0, %|r0, %0 - adds %|r1, %|r2, %|r1 - addcs %0, %0, #65536 - adds %1, %1, %|r1, lsl #16 - adc %0, %0, %|r1, lsr #16" \ + mov %|r0, %2, lsr #16 @ AAAA + mov %|r2, %3, lsr #16 @ BBBB + bic %|r1, %2, %|r0, lsl #16 @ aaaa + bic %0, %3, %|r2, lsl #16 @ bbbb + mul %1, %|r1, %|r2 @ aaaa * BBBB + mul %|r2, %|r0, %|r2 @ AAAA * BBBB + mul %|r1, %0, %|r1 @ aaaa * bbbb + mul %0, %|r0, %0 @ AAAA * bbbb + adds %|r0, %1, %0 @ central sum + addcs %|r2, %|r2, #65536 + adds %1, %|r1, %|r0, lsl #16 + adc %0, %|r2, %|r0, lsr #16" \ : "=&r" ((USItype)(xh)), \ "=r" ((USItype)(xl)) \ : "r" ((USItype)(a)), \ "r" ((USItype)(b)) \ : "r0", "r1", "r2") -#elif __ARM_ARCH_4__ +#else #define umul_ppmm(xh, xl, a, b) \ __asm__ ("%@ Inlined umul_ppmm umull %r1, %r0, %r2, %r3" \ @@ -229,8 +229,6 @@ extern UDItype __udiv_qrnnd (); : "r" ((USItype)(a)), \ "r" ((USItype)(b)) \ : "r0", "r1") -#else -#error Untested architecture #endif #define UMUL_TIME 20 #define UDIV_TIME 100 diff --git a/mpi/m68k/mc68020/mpih-mul1.S b/mpi/m68k/mc68020/mpih-mul1.S index 16a52a22..4872b9ba 100644 --- a/mpi/m68k/mc68020/mpih-mul1.S +++ b/mpi/m68k/mc68020/mpih-mul1.S @@ -1,24 +1,33 @@ /* mc68020 __mpn_mul_1 -- Multiply a limb vector with a limb and store - the result in a second limb vector. - -Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. - -This file is part of the GNU MP Library. - -The GNU MP Library is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -The GNU MP Library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -License for more details. - -You should have received a copy of the GNU Library General Public License -along with the GNU MP Library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -MA 02111-1307, USA. */ + * the result in a second limb vector. + * + * Copyright (C) 1992, 1994, 1996, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ diff --git a/mpi/m68k/mc68020/mpih-mul2.S b/mpi/m68k/mc68020/mpih-mul2.S index 8cbbc548..7c492ffb 100644 --- a/mpi/m68k/mc68020/mpih-mul2.S +++ b/mpi/m68k/mc68020/mpih-mul2.S @@ -1,24 +1,33 @@ /* mc68020 __mpn_addmul_1 -- Multiply a limb vector with a limb and add - the result to a second limb vector. - -Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. - -This file is part of the GNU MP Library. - -The GNU MP Library is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -The GNU MP Library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -License for more details. - -You should have received a copy of the GNU Library General Public License -along with the GNU MP Library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -MA 02111-1307, USA. */ + * the result to a second limb vector. + * + * Copyright (C) 1992, 1994, 1996, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ #include "sysdep.h" diff --git a/mpi/m68k/mc68020/mpih-mul3.S b/mpi/m68k/mc68020/mpih-mul3.S index 8e28ce45..1e4ac45d 100644 --- a/mpi/m68k/mc68020/mpih-mul3.S +++ b/mpi/m68k/mc68020/mpih-mul3.S @@ -1,24 +1,34 @@ /* mc68020 __mpn_submul_1 -- Multiply a limb vector with a limb and subtract - the result from a second limb vector. - -Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. - -This file is part of the GNU MP Library. - -The GNU MP Library is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -The GNU MP Library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -License for more details. + * the result from a second limb vector. + * + * Copyright (C) 1992, 1994, 1996, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ -You should have received a copy of the GNU Library General Public License -along with the GNU MP Library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -MA 02111-1307, USA. */ diff --git a/mpi/m68k/mpih-add1.S b/mpi/m68k/mpih-add1.S index b3812c78..1e9cc640 100644 --- a/mpi/m68k/mpih-add1.S +++ b/mpi/m68k/mpih-add1.S @@ -1,24 +1,33 @@ /* mc68020 __mpn_add_n -- Add two limb vectors of the same length > 0 and store - sum in a third limb vector. - -Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. - -This file is part of the GNU MP Library. - -The GNU MP Library is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -The GNU MP Library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -License for more details. - -You should have received a copy of the GNU Library General Public License -along with the GNU MP Library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -MA 02111-1307, USA. */ + * sum in a third limb vector. + * + * Copyright (C) 1992, 1994,1996, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ #include "sysdep.h" diff --git a/mpi/m68k/mpih-lshift.S b/mpi/m68k/mpih-lshift.S index af305c84..cc9dfba6 100644 --- a/mpi/m68k/mpih-lshift.S +++ b/mpi/m68k/mpih-lshift.S @@ -1,24 +1,32 @@ /* mc68020 lshift -- Shift left a low-level natural-number integer. + * + * Copyright (C) 1996, 1998, 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ -Copyright (C) 1996, 1998 Free Software Foundation, Inc. - -This file is part of GNUPG. - -GNUPG is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -GNUPG is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -License for more details. - -You should have received a copy of the GNU Library General Public License -along with the GNU MP Library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -MA 02111-1307, USA. -*/ #include "sysdep.h" #include "asm-syntax.h" diff --git a/mpi/m68k/mpih-rshift.S b/mpi/m68k/mpih-rshift.S index 5670888c..cc86166a 100644 --- a/mpi/m68k/mpih-rshift.S +++ b/mpi/m68k/mpih-rshift.S @@ -1,24 +1,32 @@ /* mc68020 rshift -- Shift right a low-level natural-number integer. + * + * Copyright (C) 1996, 1998, 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ -Copyright (C) 1996, 1998 Free Software Foundation, Inc. - -This file is part of GNUPG. - -GNUPG is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -GNUPG is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -License for more details. - -You should have received a copy of the GNU Library General Public License -along with the GNU MP Library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -MA 02111-1307, USA. -*/ #include "sysdep.h" #include "asm-syntax.h" diff --git a/mpi/m68k/mpih-sub1.S b/mpi/m68k/mpih-sub1.S index 8d8ef0b4..1847fbd6 100644 --- a/mpi/m68k/mpih-sub1.S +++ b/mpi/m68k/mpih-sub1.S @@ -1,25 +1,33 @@ /* mc68020 __mpn_sub_n -- Subtract two limb vectors of the same length > 0 and - store difference in a third limb vector. - -Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. - -This file is part of the GNU MP Library. - -The GNU MP Library is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -The GNU MP Library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -License for more details. - -You should have received a copy of the GNU Library General Public License -along with the GNU MP Library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -MA 02111-1307, USA. */ - + * store difference in a third limb vector. + * + * Copyright (C) 1992, 1994, 1996, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ #include "sysdep.h" #include "asm-syntax.h" diff --git a/mpi/m68k/syntax.h b/mpi/m68k/syntax.h index 9d6f3522..316518fe 100644 --- a/mpi/m68k/syntax.h +++ b/mpi/m68k/syntax.h @@ -1,23 +1,33 @@ /* asm.h -- Definitions for 68k syntax variations. + * + * Copyright (C) 1992, 1994, 1996, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ -Copyright (C) 1992, 1994, 1996 Free Software Foundation, Inc. - -This file is part of the GNU MP Library. - -The GNU MP Library is free software; you can redistribute it and/or modify -it under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at your -option) any later version. - -The GNU MP Library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -License for more details. - -You should have received a copy of the GNU Library General Public License -along with the GNU MP Library; see the file COPYING.LIB. If not, write to -the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -MA 02111-1307, USA. */ #undef ALIGN diff --git a/mpi/mips3/mpih-add1.S b/mpi/mips3/mpih-add1.S index 7ac5f38b..a998420d 100644 --- a/mpi/mips3/mpih-add1.S +++ b/mpi/mips3/mpih-add1.S @@ -1,15 +1,17 @@ /* mips3 add_n -- Add two limb vectors of the same length > 0 and store * sum in a third limb vector. - * Copyright (C) 1995, 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1995, 1998, 2000 + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mips3/mpih-lshift.S b/mpi/mips3/mpih-lshift.S index 37e9a5e1..112383f9 100644 --- a/mpi/mips3/mpih-lshift.S +++ b/mpi/mips3/mpih-lshift.S @@ -1,14 +1,16 @@ /* mips3 lshift - * Copyright (C) 1995, 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1995, 1998, 2000, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mips3/mpih-mul1.S b/mpi/mips3/mpih-mul1.S index fd349ee9..70409e8d 100644 --- a/mpi/mips3/mpih-mul1.S +++ b/mpi/mips3/mpih-mul1.S @@ -1,15 +1,17 @@ /* mips3 mpih-mul1.S -- Multiply a limb vector with a limb and store * the result in a second limb vector. - * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1995, 1998, 2000 + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -36,10 +38,10 @@ mpihelp_mul_1: .set noreorder .set nomacro - # warm up phase 0 +/* # warm up phase 0 */ ld $8,0($5) - # warm up phase 1 +/* # warm up phase 1 */ daddiu $5,$5,8 dmultu $8,$7 @@ -64,7 +66,7 @@ Loop: mflo $10 bne $6,$0,Loop daddu $2,$9,$2 # add high product limb and carry from addition - # cool down phase 1 +/* # cool down phase 1 */ $LC1: mflo $10 mfhi $9 daddu $10,$10,$2 @@ -74,7 +76,7 @@ $LC1: mflo $10 daddiu $4,$4,8 daddu $2,$9,$2 # add high product limb and carry from addition - # cool down phase 0 +/* # cool down phase 0 */ $LC0: mflo $10 mfhi $9 daddu $10,$10,$2 diff --git a/mpi/mips3/mpih-mul2.S b/mpi/mips3/mpih-mul2.S index 1474b4f0..1bddd053 100644 --- a/mpi/mips3/mpih-mul2.S +++ b/mpi/mips3/mpih-mul2.S @@ -1,15 +1,17 @@ /* MIPS3 addmul_1 -- Multiply a limb vector with a single limb and * add the product to a second limb vector. - * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1995, 1998, 2000 + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -36,10 +38,10 @@ mpihelp_addmul_1: .set noreorder .set nomacro - # warm up phase 0 +/* # warm up phase 0 */ ld $8,0($5) - # warm up phase 1 +/* # warm up phase 1 */ daddiu $5,$5,8 dmultu $8,$7 @@ -68,7 +70,7 @@ Loop: ld $10,0($4) bne $6,$0,Loop daddu $2,$9,$2 # add high product limb and carry from addition - # cool down phase 1 +/* # cool down phase 1 */ $LC1: ld $10,0($4) mflo $3 mfhi $9 @@ -82,7 +84,7 @@ $LC1: ld $10,0($4) daddiu $4,$4,8 daddu $2,$9,$2 # add high product limb and carry from addition - # cool down phase 0 +/* # cool down phase 0 */ $LC0: ld $10,0($4) mflo $3 mfhi $9 diff --git a/mpi/mips3/mpih-mul3.S b/mpi/mips3/mpih-mul3.S index 4616732f..82fe47d5 100644 --- a/mpi/mips3/mpih-mul3.S +++ b/mpi/mips3/mpih-mul3.S @@ -1,15 +1,17 @@ /* MIPS3 submul_1 -- Multiply a limb vector with a single limb and * subtract the product from a second limb vector. - * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1995, 1998, 2000 + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -36,10 +38,10 @@ mpihelp_submul_1: .set noreorder .set nomacro - # warm up phase 0 +/* # warm up phase 0 */ ld $8,0($5) - # warm up phase 1 +/* # warm up phase 1 */ daddiu $5,$5,8 dmultu $8,$7 @@ -68,7 +70,7 @@ Loop: ld $10,0($4) bne $6,$0,Loop daddu $2,$9,$2 # add high product limb and carry from addition - # cool down phase 1 +/* # cool down phase 1 */ $LC1: ld $10,0($4) mflo $3 mfhi $9 @@ -82,7 +84,7 @@ $LC1: ld $10,0($4) daddiu $4,$4,8 daddu $2,$9,$2 # add high product limb and carry from addition - # cool down phase 0 +/* # cool down phase 0 */ $LC0: ld $10,0($4) mflo $3 mfhi $9 diff --git a/mpi/mips3/mpih-rshift.S b/mpi/mips3/mpih-rshift.S index 7bc08450..74a6cc96 100644 --- a/mpi/mips3/mpih-rshift.S +++ b/mpi/mips3/mpih-rshift.S @@ -1,14 +1,16 @@ /* mips3 rshift - * Copyright (C) 1995, 1998 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * Copyright (C) 1995, 1998, 2000 + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mips3/mpih-sub1.S b/mpi/mips3/mpih-sub1.S index 4bc3ad29..72f506ea 100644 --- a/mpi/mips3/mpih-sub1.S +++ b/mpi/mips3/mpih-sub1.S @@ -1,15 +1,17 @@ /* mips3 sub_n -- Subtract two limb vectors of the same length > 0 and * store difference in a third limb vector. - * Copyright (C) 1995, 1998 Free Software Foundation, Inc. + * + * Copyright (C) 1995, 1998, 1999, 2000, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c index 4c169875..aea641bb 100644 --- a/mpi/mpicoder.c +++ b/mpi/mpicoder.c @@ -75,12 +75,12 @@ mpi_read_from_buffer(byte *buffer, unsigned *ret_nread, int secure) /**************** - * Make an mpi from a character string. + * Make an mpi from a hex character string. */ -int +static int mpi_fromstr(MPI val, const char *str) { - int hexmode=0, sign=0, prepend_zero=0, i, j, c, c1, c2; + int sign=0, prepend_zero=0, i, j, c, c1, c2; unsigned nbits, nbytes, nlimbs; mpi_limb_t a; @@ -88,11 +88,11 @@ mpi_fromstr(MPI val, const char *str) sign = 1; str++; } - if( *str == '0' && str[1] == 'x' ) - hexmode = 1; - else - return 1; /* other bases are not yet supported */ - str += 2; + + /* skip optional hex prefix */ + if ( *str == '0' && str[1] == 'x' ) { + str += 2; + } nbits = strlen(str)*4; if( nbits % 8 ) diff --git a/mpi/pa7100/mpih-lshift.S b/mpi/pa7100/mpih-lshift.S index e17e1b70..76368fe7 100644 --- a/mpi/pa7100/mpih-lshift.S +++ b/mpi/pa7100/mpih-lshift.S @@ -1,16 +1,17 @@ /* hppa lshift - * optimized for the PA7100, where is runs at 3.25 cycles/limb - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. + * optimized for the PA7100, where it runs at 3.25 cycles/limb + * + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -32,7 +33,7 @@ .code .export mpihelp_lshift -mpihelp_lshift + .label mpihelp_lshift .proc .callinfo frame=64,no_calls .entry @@ -48,7 +49,8 @@ mpihelp_lshift addib,<= -5,%r24,L$rest vshd %r22,%r29,%r20 -L$loop ldws,mb -4(0,%r25),%r22 + .label L$loop + ldws,mb -4(0,%r25),%r22 stws,mb %r20,-4(0,%r26) vshd %r29,%r22,%r20 ldws,mb -4(0,%r25),%r29 @@ -62,9 +64,11 @@ L$loop ldws,mb -4(0,%r25),%r22 addib,> -4,%r24,L$loop vshd %r22,%r29,%r20 -L$rest addib,= 4,%r24,L$end1 + .label L$rest + addib,= 4,%r24,L$end1 nop -L$eloop ldws,mb -4(0,%r25),%r22 + .label L$eloop + ldws,mb -4(0,%r25),%r22 stws,mb %r20,-4(0,%r26) addib,<= -1,%r24,L$end2 vshd %r29,%r22,%r20 @@ -73,12 +77,15 @@ L$eloop ldws,mb -4(0,%r25),%r22 addib,> -1,%r24,L$eloop vshd %r22,%r29,%r20 -L$end1 stws,mb %r20,-4(0,%r26) + .label L$end1 + stws,mb %r20,-4(0,%r26) vshd %r29,%r0,%r20 bv 0(%r2) stw %r20,-4(0,%r26) -L$end2 stws,mb %r20,-4(0,%r26) -L$0004 vshd %r22,%r0,%r20 + .label L$end2 + stws,mb %r20,-4(0,%r26) + .label L$0004 + vshd %r22,%r0,%r20 bv 0(%r2) stw %r20,-4(0,%r26) diff --git a/mpi/pa7100/mpih-rshift.S b/mpi/pa7100/mpih-rshift.S index b409de04..3bada7ce 100644 --- a/mpi/pa7100/mpih-rshift.S +++ b/mpi/pa7100/mpih-rshift.S @@ -1,16 +1,17 @@ /* hppa rshift - * optimized for the PA7100, where is runs at 3.25 cycles/limb - * Copyright (C) 1992, 1994 Free Software Foundation, Inc. - * Copyright (C) 1998 Free Software Foundation, Inc. + * optimized for the PA7100, where it runs at 3.25 cycles/limb * - * This file is part of GNUPG. + * Copyright (C) 1992, 1994, 1998, + * 2001 Free Software Foundation, Inc. * - * GNUPG is free software; you can redistribute it and/or modify + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. @@ -32,7 +33,7 @@ .code .export mpihelp_rshift -mpihelp_rshift + .label mpihelp_rshift .proc .callinfo frame=64,no_calls .entry @@ -45,7 +46,8 @@ mpihelp_rshift addib,<= -5,%r24,L$rrest vshd %r29,%r22,%r20 -L$roop ldws,ma 4(0,%r25),%r22 + .label L$roop + ldws,ma 4(0,%r25),%r22 stws,ma %r20,4(0,%r26) vshd %r22,%r29,%r20 ldws,ma 4(0,%r25),%r29 @@ -59,9 +61,11 @@ L$roop ldws,ma 4(0,%r25),%r22 addib,> -4,%r24,L$roop vshd %r29,%r22,%r20 -L$rrest addib,= 4,%r24,L$rend1 + .label L$rrest + addib,= 4,%r24,L$rend1 nop -L$eroop ldws,ma 4(0,%r25),%r22 + .label L$eroop + ldws,ma 4(0,%r25),%r22 stws,ma %r20,4(0,%r26) addib,<= -1,%r24,L$rend2 vshd %r22,%r29,%r20 @@ -70,12 +74,15 @@ L$eroop ldws,ma 4(0,%r25),%r22 addib,> -1,%r24,L$eroop vshd %r29,%r22,%r20 -L$rend1 stws,ma %r20,4(0,%r26) + .label L$rend1 + stws,ma %r20,4(0,%r26) vshd %r0,%r29,%r20 bv 0(%r2) stw %r20,0(0,%r26) -L$rend2 stws,ma %r20,4(0,%r26) -L$r004 vshd %r0,%r22,%r20 + .label L$rend2 + stws,ma %r20,4(0,%r26) + .label L$r004 + vshd %r0,%r22,%r20 bv 0(%r2) stw %r20,0(0,%r26) diff --git a/mpi/power/mpih-add1.S b/mpi/power/mpih-add1.S index 27f8f666..7313ac61 100644 --- a/mpi/power/mpih-add1.S +++ b/mpi/power/mpih-add1.S @@ -1,15 +1,15 @@ /* IBM POWER add_n -- Add two limb vectors of equal, non-zero length. * - * Copyright (C) 1992, 1994, 1995, 1996, 1999 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1996, 1999 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/power/mpih-lshift.S b/mpi/power/mpih-lshift.S index bb7a9dba..20cf4535 100644 --- a/mpi/power/mpih-lshift.S +++ b/mpi/power/mpih-lshift.S @@ -1,15 +1,15 @@ /* IBM POWER lshift * - * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/power/mpih-mul1.S b/mpi/power/mpih-mul1.S index 9daabe82..03fff4f9 100644 --- a/mpi/power/mpih-mul1.S +++ b/mpi/power/mpih-mul1.S @@ -1,16 +1,16 @@ /* IBM POWER mul_1 -- Multiply a limb vector with a limb and store - * the result in a second limb vector. + * the result in a second limb vector. * - * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/power/mpih-mul2.S b/mpi/power/mpih-mul2.S index 8cf2ec08..3d7fc153 100644 --- a/mpi/power/mpih-mul2.S +++ b/mpi/power/mpih-mul2.S @@ -1,16 +1,16 @@ /* IBM POWER addmul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. * - * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/power/mpih-mul3.S b/mpi/power/mpih-mul3.S index 458b0038..f94018ca 100644 --- a/mpi/power/mpih-mul3.S +++ b/mpi/power/mpih-mul3.S @@ -1,16 +1,16 @@ /* IBM POWER submul_1 -- Multiply a limb vector with a limb and subtract * the result from a second limb vector. * - * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/power/mpih-rshift.S b/mpi/power/mpih-rshift.S index 6b79a1c3..04fb5942 100644 --- a/mpi/power/mpih-rshift.S +++ b/mpi/power/mpih-rshift.S @@ -1,15 +1,15 @@ /* IBM POWER rshift * - * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1999 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/power/mpih-sub1.S b/mpi/power/mpih-sub1.S index f01839af..375a5be8 100644 --- a/mpi/power/mpih-sub1.S +++ b/mpi/power/mpih-sub1.S @@ -1,15 +1,16 @@ /* IBM POWER sub_n -- Subtract two limb vectors of equal, non-zero length. * - * Copyright (C) 1992, 1994, 1995, 1996, 1999 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1995, 1996, 1999 + * Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/powerpc32/mpih-add1.S b/mpi/powerpc32/mpih-add1.S index 2b22495e..81c4e20f 100644 --- a/mpi/powerpc32/mpih-add1.S +++ b/mpi/powerpc32/mpih-add1.S @@ -1,15 +1,15 @@ /* PowerPC-32 add_n -- Add two limb vectors of equal, non-zero length. * - * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/powerpc32/mpih-lshift.S b/mpi/powerpc32/mpih-lshift.S index 8b5f2b21..20ca7f92 100644 --- a/mpi/powerpc32/mpih-lshift.S +++ b/mpi/powerpc32/mpih-lshift.S @@ -1,15 +1,15 @@ /* PowerPC-32 lshift * - * Copyright (C) 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1995, 1998 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/powerpc32/mpih-mul1.S b/mpi/powerpc32/mpih-mul1.S index 5b88cf49..b3cb62f3 100644 --- a/mpi/powerpc32/mpih-mul1.S +++ b/mpi/powerpc32/mpih-mul1.S @@ -1,16 +1,17 @@ /* PowerPC-32 mul_1 -- Multiply a limb vector with a limb and store * the result in a second limb vector. * - * Copyright (C) 1993, 1994, 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1992, 1993, 1994, 1995, + * 1998 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/powerpc32/mpih-mul2.S b/mpi/powerpc32/mpih-mul2.S index c7d00ab1..d3b39bc0 100644 --- a/mpi/powerpc32/mpih-mul2.S +++ b/mpi/powerpc32/mpih-mul2.S @@ -1,16 +1,16 @@ /* PowerPC-32 addmul_1 -- Multiply a limb vector with a limb and add * the result to a second limb vector. * - * Copyright (C) 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1995, 1998 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/powerpc32/mpih-mul3.S b/mpi/powerpc32/mpih-mul3.S index 4c9d0588..d84f853b 100644 --- a/mpi/powerpc32/mpih-mul3.S +++ b/mpi/powerpc32/mpih-mul3.S @@ -1,16 +1,16 @@ /* PowerPC-32 submul_1 -- Multiply a limb vector with a limb and subtract * the result from a second limb vector. * - * Copyright (C) 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1995, 1998 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/powerpc32/mpih-rshift.S b/mpi/powerpc32/mpih-rshift.S index bc786adb..e9704db9 100644 --- a/mpi/powerpc32/mpih-rshift.S +++ b/mpi/powerpc32/mpih-rshift.S @@ -1,15 +1,15 @@ /* PowerPC-32 rshift * - * Copyright (C) 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1995, 1998 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/powerpc32/mpih-sub1.S b/mpi/powerpc32/mpih-sub1.S index 58fa83ff..8c67d988 100644 --- a/mpi/powerpc32/mpih-sub1.S +++ b/mpi/powerpc32/mpih-sub1.S @@ -1,16 +1,16 @@ /* PowerPC-32 sub_n -- Subtract two limb vectors of the same length > 0 * and store difference in a third limb vector. * - * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc. + * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc. * - * This file is part of Libgcrypt. + * This file is part of GnuPG. * - * Libgcrypt is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * Libgcrypt is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/sparc32/mpih-add1.S b/mpi/sparc32/mpih-add1.S index b90d9d60..b8faadb5 100644 --- a/mpi/sparc32/mpih-add1.S +++ b/mpi/sparc32/mpih-add1.S @@ -1,16 +1,17 @@ /* SPARC _add_n -- Add two limb vectors of the same length > 0 and store * sum in a third limb vector. * - * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. + * Copyright (C) 1995, 1996, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/sparc32/mpih-lshift.S b/mpi/sparc32/mpih-lshift.S index 5348a157..b217d5e6 100644 --- a/mpi/sparc32/mpih-lshift.S +++ b/mpi/sparc32/mpih-lshift.S @@ -1,15 +1,16 @@ /* sparc lshift * - * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. + * Copyright (C) 1995, 1996, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/sparc32/mpih-rshift.S b/mpi/sparc32/mpih-rshift.S index e74675d1..62902cbe 100644 --- a/mpi/sparc32/mpih-rshift.S +++ b/mpi/sparc32/mpih-rshift.S @@ -1,15 +1,16 @@ /* sparc rshift * - * Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc. + * Copyright (C) 1995, 1996, 1998, + * 2001 Free Software Foundation, Inc. * - * This file is part of GNUPG. + * This file is part of GnuPG. * - * GNUPG is free software; you can redistribute it and/or modify + * GnuPG is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * - * GNUPG is distributed in the hope that it will be useful, + * GnuPG is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. diff --git a/mpi/sparc32/udiv.S b/mpi/sparc32/udiv.S index 3e2376cf..752d0719 100644 --- a/mpi/sparc32/udiv.S +++ b/mpi/sparc32/udiv.S @@ -1,24 +1,33 @@ -! SPARC v7 __udiv_qrnnd division support, used from longlong.h. -! This is for v7 CPUs without a floating-point unit. - -! Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc. - -! This file is part of the GNU MP Library. - -! The GNU MP Library is free software; you can redistribute it and/or modify -! it under the terms of the GNU Library General Public License as published by -! the Free Software Foundation; either version 2 of the License, or (at your -! option) any later version. - -! The GNU MP Library is distributed in the hope that it will be useful, but -! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -! License for more details. - -! You should have received a copy of the GNU Library General Public License -! along with the GNU MP Library; see the file COPYING.LIB. If not, write to -! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -! MA 02111-1307, USA. +/* SPARC v7 __udiv_qrnnd division support, used from longlong.h. + * This is for v7 CPUs without a floating-point unit. + * + * Copyright (C) 1993, 1994, 1996, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ ! INPUT PARAMETERS diff --git a/mpi/sparc32v8/mpih-mul1.S b/mpi/sparc32v8/mpih-mul1.S index 8bc1db57..55145006 100644 --- a/mpi/sparc32v8/mpih-mul1.S +++ b/mpi/sparc32v8/mpih-mul1.S @@ -1,24 +1,34 @@ -! SPARC v8 __mpn_mul_1 -- Multiply a limb vector with a single limb and -! store the product in a second limb vector. +/* SPARC v8 __mpn_mul_1 -- Multiply a limb vector with a single limb and + * store the product in a second limb vector. + * + * Copyright (C) 1992, 1994, 1995, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ -! Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. - -! This file is part of the GNU MP Library. - -! The GNU MP Library is free software; you can redistribute it and/or modify -! it under the terms of the GNU Library General Public License as published by -! the Free Software Foundation; either version 2 of the License, or (at your -! option) any later version. - -! The GNU MP Library is distributed in the hope that it will be useful, but -! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -! License for more details. - -! You should have received a copy of the GNU Library General Public License -! along with the GNU MP Library; see the file COPYING.LIB. If not, write to -! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -! MA 02111-1307, USA. ! INPUT PARAMETERS diff --git a/mpi/sparc32v8/mpih-mul2.S b/mpi/sparc32v8/mpih-mul2.S index 9055f89e..55f37814 100644 --- a/mpi/sparc32v8/mpih-mul2.S +++ b/mpi/sparc32v8/mpih-mul2.S @@ -1,24 +1,34 @@ -! SPARC v8 __mpn_addmul_1 -- Multiply a limb vector with a limb and -! add the result to a second limb vector. +/* SPARC v8 __mpn_addmul_1 -- Multiply a limb vector with a limb and + * add the result to a second limb vector. + * + * Copyright (C) 1992, 1993, 1994, 1995, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ -! Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. - -! This file is part of the GNU MP Library. - -! The GNU MP Library is free software; you can redistribute it and/or modify -! it under the terms of the GNU Library General Public License as published by -! the Free Software Foundation; either version 2 of the License, or (at your -! option) any later version. - -! The GNU MP Library is distributed in the hope that it will be useful, but -! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -! License for more details. - -! You should have received a copy of the GNU Library General Public License -! along with the GNU MP Library; see the file COPYING.LIB. If not, write to -! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -! MA 02111-1307, USA. ! INPUT PARAMETERS diff --git a/mpi/sparc32v8/mpih-mul3.S b/mpi/sparc32v8/mpih-mul3.S index efd83de4..cfd0a157 100644 --- a/mpi/sparc32v8/mpih-mul3.S +++ b/mpi/sparc32v8/mpih-mul3.S @@ -1,26 +1,35 @@ -! SPARC v8 __mpn_submul_1 -- Multiply a limb vector with a limb and -! subtract the result from a second limb vector. - -! Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. - -! This file is part of the GNU MP Library. - -! The GNU MP Library is free software; you can redistribute it and/or modify -! it under the terms of the GNU Library General Public License as published by -! the Free Software Foundation; either version 2 of the License, or (at your -! option) any later version. - -! The GNU MP Library is distributed in the hope that it will be useful, but -! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -! License for more details. - -! You should have received a copy of the GNU Library General Public License -! along with the GNU MP Library; see the file COPYING.LIB. If not, write to -! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -! MA 02111-1307, USA. - +/* SPARC v8 __mpn_submul_1 -- Multiply a limb vector with a limb and + * subtract the result from a second limb vector. + * + * Copyright (C) 1992, 1993, 1994, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ + ! INPUT PARAMETERS ! res_ptr o0 ! s1_ptr o1 diff --git a/mpi/supersparc/udiv.S b/mpi/supersparc/udiv.S index 07d904c7..31b7387c 100644 --- a/mpi/supersparc/udiv.S +++ b/mpi/supersparc/udiv.S @@ -1,25 +1,35 @@ -! SuperSPARC __udiv_qrnnd division support, used from longlong.h. -! This is for SuperSPARC only, to compensate for its semi-functional -! udiv instruction. +/* SuperSPARC __udiv_qrnnd division support, used from longlong.h. + * This is for SuperSPARC only, to compensate for its + * semi-functional udiv instruction. + * + * Copyright (C) 1993, 1994, 1996, 1998, + * 2001 Free Software Foundation, Inc. + * + * This file is part of GnuPG. + * + * GnuPG is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * GnuPG is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * Note: This code is heavily based on the GNU MP Library. + * Actually it's the same code with only minor changes in the + * way the data is stored; this is to support the abstraction + * of an optional secure memory allocation which may be used + * to avoid revealing of sensitive data due to paging etc. + * The GNU MP Library itself is published under the LGPL; + * however I decided to publish this code under the plain GPL. + */ -! Copyright (C) 1993, 1994, 1996 Free Software Foundation, Inc. - -! This file is part of the GNU MP Library. - -! The GNU MP Library is free software; you can redistribute it and/or modify -! it under the terms of the GNU Library General Public License as published by -! the Free Software Foundation; either version 2 of the License, or (at your -! option) any later version. - -! The GNU MP Library is distributed in the hope that it will be useful, but -! WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -! or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public -! License for more details. - -! You should have received a copy of the GNU Library General Public License -! along with the GNU MP Library; see the file COPYING.LIB. If not, write to -! the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -! MA 02111-1307, USA. ! INPUT PARAMETERS diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 16779ff2..4d33d039 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,7 +1,12 @@ +2001-05-28 Werner Koch <wk@gnupg.org> + + * db2html.in: Removed. + * db2any: New. Taken from GPH + Mon Jul 17 16:35:47 CEST 2000 Werner Koch <wk@> - * config.gues, config.sub: Support for s390-ibm-linux-gnu; thanks - to Holger Smolinski. Add support for QNX; by Sam Roberts. + * config.gues, config.sub: Support for s390-ibm-linux-gnu; thanks + to Holger Smolinski. Add support for QNX; by Sam Roberts. Tue Oct 26 14:10:21 CEST 1999 Werner Koch <wk@gnupg.de> @@ -10,29 +15,24 @@ Tue Oct 26 14:10:21 CEST 1999 Werner Koch <wk@gnupg.de> Wed Sep 15 16:22:17 CEST 1999 Werner Koch <wk@isil.d.shuttle.de> - * gnupg.spec: Add Portuguese description Thu Sep 2 16:40:55 CEST 1999 Werner Koch <wk@isil.d.shuttle.de> - * mkdiff: changed format of diff file name and made script more general. Wed Aug 4 10:34:18 CEST 1999 Werner Koch <wk@isil.d.shuttle.de> - * config.guess: Updated from gnu/common and applied my emx patch again. * config.sub: Updated from gnu/common. Wed Jul 14 19:42:08 CEST 1999 Werner Koch <wk@isil.d.shuttle.de> - * ltmain.sh, ltconfig.sh : Updated to libtool 1.3.3 Mon Jul 12 14:55:34 CEST 1999 Werner Koch <wk@isil.d.shuttle.de> - * autogen.sh: Run libtoolize Sat May 22 22:47:26 CEST 1999 Werner Koch <wk@isil.d.shuttle.de> diff --git a/scripts/config.guess b/scripts/config.guess index 50fd53e3..e1b58717 100755 --- a/scripts/config.guess +++ b/scripts/config.guess @@ -10,7 +10,7 @@ # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License @@ -24,7 +24,7 @@ # Written by Per Bothner <bothner@cygnus.com>. # The master version of this file is at the FSF in /home/gd/gnu/lib. -# Please send patches to the Autoconf mailing list <autoconf@gnu.org>. +# Please send patches to <autoconf-patches@gnu.org>. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -68,9 +68,6 @@ trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:QNX:*:*) - echo i386-pc-qnx - exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -159,6 +156,9 @@ EOF wgrisc:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -229,30 +229,30 @@ EOF exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor + # "atarist" or "atariste" at least should have a processor # > m68000). The system name ranges from "MiNT" over "FreeMiNT" # to the lowercase version "mint" (or "freemint"). Finally # the system name "TOS" denotes a system which is actually not # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit 0 ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit 0 ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; sun3*:NetBSD:*:*) echo m68k-sun-netbsd${UNAME_RELEASE} exit 0 ;; @@ -275,8 +275,8 @@ EOF echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; macppc:NetBSD:*:*) - echo powerpc-apple-netbsd${UNAME_RELEASE} - exit 0 ;; + echo powerpc-apple-netbsd${UNAME_RELEASE} + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit 0 ;; @@ -290,7 +290,7 @@ EOF echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus int main (int argc, char *argv[]) { #else @@ -329,19 +329,22 @@ EOF echo m88k-motorola-sysv3 exit 0 ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ - -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then echo m88k-dg-dgux${UNAME_RELEASE} - else + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) + exit 0 ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit 0 ;; M88*:*:R3*:*) @@ -359,13 +362,13 @@ EOF exit 0 ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i?86:AIX:*:*) echo i386-ibm-aix exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c #include <sys/systemcfg.h> main() @@ -405,9 +408,9 @@ EOF ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx exit 0 ;; @@ -422,48 +425,48 @@ EOF exit 0 ;; 9000/[34678]??:HP-UX:*:*) case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - sed 's/^ //' << EOF >$dummy.c - #include <stdlib.h> - #include <unistd.h> + sed 's/^ //' << EOF >$dummy.c + #include <stdlib.h> + #include <unistd.h> - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF - ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` rm -f $dummy.c $dummy esac HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c #include <unistd.h> int main () @@ -471,7 +474,7 @@ EOF long cpu = sysconf (_SC_CPU_VERSION); /* The order matters, because CPU_IS_HP_MC68K erroneously returns true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ + results, however. */ if (CPU_IS_PA_RISC (cpu)) { switch (cpu) @@ -522,25 +525,25 @@ EOF exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit 0 ;; CRAY*X-MP:*:*:*) echo xmp-cray-unicos - exit 0 ;; + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} exit 0 ;; @@ -553,16 +556,16 @@ EOF echo t90-cray-unicos${UNAME_RELEASE} exit 0 ;; CRAY*T3E:*:*:*) - echo t3e-cray-unicosmk${UNAME_RELEASE} + echo alpha-cray-unicosmk${UNAME_RELEASE} exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos - exit 0 ;; + exit 0 ;; F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; F301:UNIX_System_V:*:*) echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` exit 0 ;; @@ -591,7 +594,7 @@ EOF echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` @@ -621,12 +624,6 @@ EOF echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; *:Linux:*:*) - # uname on the ARM produces all sorts of strangeness, and we need to - # filter it out. - case "$UNAME_MACHINE" in - armv*) UNAME_MACHINE=$UNAME_MACHINE ;; - arm* | sa110*) UNAME_MACHINE="arm" ;; - esac # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -634,17 +631,43 @@ EOF ld_help_string=`cd /; ld --help 2>&1` ld_supported_emulations=`echo $ld_help_string \ | sed -ne '/supported emulations:/!d - s/[ ][ ]*/ /g + s/[ ][ ]*/ /g s/.*supported emulations: *// s/ .*// p'` - case "$ld_supported_emulations" in - i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; - i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; - sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - elf_s390) echo "${UNAME_MACHINE}-ibm-linux-gnu" ; exit 0 ;; + case "$ld_supported_emulations" in + *ia64) + echo "${UNAME_MACHINE}-unknown-linux" + exit 0 + ;; + i?86linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 + ;; + i?86coff) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 + ;; + sparclinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + armlinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + elf32arm*) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; + armelf_linux*) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; + m68klinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; elf32ppc) # Determine Lib Version cat >$dummy.c <<EOF @@ -672,13 +695,15 @@ EOF if test "$?" = 0 ; then LIBC="libc1" fi - fi + fi rm -f $dummy.c $dummy - echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;; + echo powerpc-unknown-linux-gnu${LIBC} + exit 0 + ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then - sed 's/^ //' <<EOF >$dummy.s + sed 's/^ //' <<EOF >$dummy.s .globl main .ent main main: @@ -793,27 +818,29 @@ EOF echo i386-sequent-sysv4 exit 0 ;; i?86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit 0 ;; i?86:*:5:7*) - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} + # Fixed at (any) Pentium or better + UNAME_MACHINE=i586 + if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then + echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + fi exit 0 ;; i?86:*:3.2:*) if test -f /usr/options/cb.name; then @@ -834,10 +861,10 @@ EOF fi exit 0 ;; pc:*:*:*) - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i386. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp - exit 0 ;; + exit 0 ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit 0 ;; @@ -866,8 +893,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -901,9 +928,9 @@ EOF fi exit 0 ;; PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Richard.M.Bartel@ccMail.Census.GOV> - echo i586-unisys-sysv4 - exit 0 ;; + # says <Richard.M.Bartel@ccMail.Census.GOV> + echo i586-unisys-sysv4 + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes@openmarket.com>. # How about differentiating between stratus architectures? -djm @@ -921,11 +948,11 @@ EOF exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit 0 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit 0 ;; @@ -947,6 +974,9 @@ EOF *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; + *:QNX:*:4*) + echo i386-qnx-qnx${UNAME_VERSION} + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -968,11 +998,11 @@ main () #include <sys/param.h> printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else "" #endif - ); exit (0); + ); exit (0); #endif #endif @@ -1049,10 +1079,6 @@ main () printf ("i860-alliant-bsd\n"); exit (0); #endif -#if defined(__EMX__) - printf ("i386-pc-os2_emx"); exit(0); -#endif - exit (1); } EOF diff --git a/scripts/config.sub b/scripts/config.sub index 0159f720..28426bb8 100755 --- a/scripts/config.sub +++ b/scripts/config.sub @@ -12,7 +12,7 @@ # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License @@ -34,7 +34,7 @@ # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. # Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish +# it does not support. The user should be able to distinguish # a failure to support a valid configuration from a meaningless # configuration. @@ -105,7 +105,7 @@ case $os in -scout) ;; -wrs) - os=vxworks + os=-vxworks basic_machine=$1 ;; -hiux*) @@ -156,27 +156,31 @@ case $os in -psos*) os=-psos ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; esac # Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in # Recognize the basic CPU types without company name. # Some are omitted here because they have special meanings below. - tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ + tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] | s390 \ + | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el \ + | mips64vr5000 | miprs64vr5000el | mcore \ | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ - | thumb | d10v) + | thumb | d10v | fr30) basic_machine=$basic_machine-unknown ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) ;; # We use `pc' rather than `unknown' @@ -185,19 +189,14 @@ case $basic_machine in i[34567]86) basic_machine=$basic_machine-pc ;; - s390 | s390-ibm) - basic_machine=s390-ibm - ;; - s390-redhat) - basic_machine=s390-redhat - ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ + # FIXME: clean up the formatting here. + vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ @@ -210,10 +209,10 @@ case $basic_machine in | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* \ + | mipstx39-* | mipstx39el-* | mcore-* \ | f301-* | armv*-* | t3e-* \ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) + | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* ) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -431,7 +430,6 @@ case $basic_machine in ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? i[34567]86v32) @@ -466,6 +464,9 @@ case $basic_machine in basic_machine=i386-unknown os=-mingw32 ;; + i386-qnx | qnx) + basic_machine=i386-qnx + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -494,7 +495,7 @@ case $basic_machine in miniframe) basic_machine=m68000-convergent ;; - *mint | *MiNT) + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; @@ -520,6 +521,10 @@ case $basic_machine in basic_machine=i386-unknown os=-msdos ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -529,7 +534,7 @@ case $basic_machine in os=-netbsd ;; netwinder) - basic_machine=armv4l-corel + basic_machine=armv4l-rebel os=-linux ;; news | news700 | news800 | news900) @@ -606,7 +611,7 @@ case $basic_machine in pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; pentium | p5 | k5 | k6 | nexen) @@ -633,12 +638,12 @@ case $basic_machine in power) basic_machine=rs6000-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; @@ -762,8 +767,8 @@ case $basic_machine in os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -788,7 +793,7 @@ case $basic_machine in basic_machine=xmp-cray os=-unicos ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; z8k-*-coff) @@ -836,7 +841,7 @@ case $basic_machine in sparc | sparcv9) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -878,8 +883,8 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -887,9 +892,6 @@ case $os in -solaris) os=-solaris2 ;; - -qnx) - os=-qnx - ;; -svr4*) os=-sysv4 ;; @@ -916,7 +918,7 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) + | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*) # Remember, each alternative MUST END IN *, to match a version number. ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ @@ -935,6 +937,9 @@ case $os in -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; -osfrose*) os=-osfrose ;; @@ -957,7 +962,7 @@ case $os in os=-sysv ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; # Preserve the version number of sinix5. -sinix5.*) @@ -972,6 +977,9 @@ case $os in -oss*) os=-sysv3 ;; + -qnx) + os=-qnx4 + ;; -svr4) os=-sysv4 ;; @@ -993,8 +1001,8 @@ case $os in -xenix) os=-xenix ;; - -*mint | -*MiNT) - os=-mint + -*mint | -*MiNT) + os=-mint ;; -none) ;; @@ -1021,13 +1029,13 @@ case $basic_machine in *-acorn) os=-riscix1.2 ;; - arm*-corel) + arm*-rebel) os=-linux ;; arm*-semi) os=-aout ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1117,19 +1125,19 @@ case $basic_machine in *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1195,7 +1203,7 @@ case $basic_machine in -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) vendor=ibm ;; -ptx*) diff --git a/scripts/db2any b/scripts/db2any new file mode 100755 index 00000000..96606f8c --- /dev/null +++ b/scripts/db2any @@ -0,0 +1,489 @@ +#!/bin/sh +# db2any - Docbook to html/ps/info rendering +# +# Copyright (C) 2000, 2001 Free Software Foundation, Inc +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA +# +# Note: This requires a Posix shell +# +# $Id$ + +pgm="db2any" +version="0.7.3" + +usage () { + echo 'usage: db2any [--help] [options] filename' >&2 + exit 1 +} + +show_banner () { + cat <<EOF +$pgm $version +Copyright (C) 2001 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +EOF +} + +show_help () { + show_banner + cat <<EOF +usage: db2any [options] docbookfile + +Options: + --mode select the mode (one of: ${all_modes}) + --help + --nosplit + --copyfiles + --systemcheck + --verbose + --draft + --manvolume n + --usestyle file + --ignore-xref [not yet implemented] + +EOF + exit 0 +} + +# a list of all possible stylesheet locations +stylesheet_dirs=' +/usr/local/lib/dsssl/stylesheets/docbook +/usr/local/share/dsssl/stylesheets/docbook +/usr/local/lib/sgml/stylesheet/dsssl/docbook/nwalsh +/usr/local/share/sgml/stylesheet/dsssl/docbook/nwalsh +/usr/lib/dsssl/stylesheets/docbook +/usr/share/dsssl/stylesheets/docbook +/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh +/usr/share/sgml/stylesheet/dsssl/docbook/nwalsh +/usr/lib/sgml/stylesheets/nwalsh-modular +/usr/share/sgml/stylesheets/nwalsh-modular +' + +all_modes="check tex html man texinfo" +input= +verbose=no +draft=no +nosplit=no +copyfiles=no +systemcheck_only=no +mode=none +manvolume="man" +usestyle="" +expected_args=1 +ignore_xref=no +while test "`echo $1 | head -c1`" = "-"; do + case $1 in + --version) + echo "$pgm $version" + exit 0 + ;; + --help|-h|-help) + show_help + exit 0 + ;; + --nosplit) + nosplit=yes + ;; + --copyfiles) + copyfiles=yes + ;; + --systemcheck) + systemcheck_only=yes + expected_args=0 + ;; + --mode) + shift + if [ $# = 0 ]; then + echo "$pgm: missing argument for --mode" >&2 + exit 1 + fi + mode="$1" + ;; + --manvolume) + shift + if [ $# = 0 ]; then + echo "$pgm: missing argument for --manvolume" >&2 + exit 1 + fi + manvolume="$1" + ;; + --usestyle) + shift + if [ $# = 0 ]; then + echo "$pgm: missing argument for --usestyle" >&2 + exit 1 + fi + usestyle="$1" + ;; + --verbose) + verbose=yes + ;; + --draft) + draft=yes + ;; + --ignore-xref) + ignore_xref=yes + ;; + --) + shift + break + ;; + *) + echo "$pgm: invalid option $1" >&2 + exit 1 + ;; + esac + shift +done + +if [ $# = $expected_args ]; then + if [ $# = 1 ]; then + input="$1" + fi +else + usage +fi + +# check the mode +case "$mode" in + html|HTML) + mode=html + ;; + tex|TEX|TeX|dvi) + mode=dvi + ;; + man|MAN) + mode=man + ;; + texi|TEXI|texinfo|TEXINFO) + mode=texinfo + ;; + check) + ;; + none) + if [ $systemcheck_only != yes ]; then + echo "$pgm: no mode specified; use one of: ${all_modes}" >&2 + exit 1 + fi + ;; + *) + echo "$pgm: invalid mode $mode" >&2 + echo "$pgm: valid modes are: ${all_modes}" >&2 + exit 1 + ;; +esac + +if [ -n $usestyle ]; then + if [ ! -f $usestyle ]; then + echo "$pgm: cannot access local stylesteet" >&2 + exit 1 + fi +fi + +####################################### +# Options are all parsed here # +####################################### + +# check whether the given program is availbale in the path +check_prog () { + tmp="$1" + save_ifs="$IFS"; IFS=":" + for i in $PATH; do + test -z "$i" && i=. + if test -f $i/$tmp; then + IFS="$save_ifs" + return 0 + fi + done + IFS="$save_ifs" + return 1 +} + + +# Figure out all what we need to know about the system we are +# running on and where the Docbook tools are installed. +# Tell about it when running in verbose mode. +do_systemcheck () { + # look for Jade + jade_version=`jade -v </dev/null 2>&1 | \ + sed -n 's/.*:I:.*Jade version "\([0-9.]*\)"/\1/p'` + if [ -z "$jade_version" ]; then + echo "$pgm: error: jade not found" >&2 + exit 1 + fi + [ $verbose = yes ] && echo "$pgm: Jade version $jade_version found" >&2 + + # look for JadeTeX + if ! jadetex -v 2>/dev/null | grep -q '^TeX' ; then + echo "$pgm: error: jadetex not found" >&2 + exit 1 + fi + + # look for the docbook-to-man script. Fixme: we should check that it + # it is a recent version. + if ! docbook-to-man 2>&1 | grep -q '^usage' ; then + echo "$pgm: error: docbook-to-man not found" >&2 + exit 1 + fi + [ $verbose = yes ] && echo "$pgm: docbook-to-man found" >&2 + + # look for the docbook-to-texi scripts. + if ! check_prog docbook2texi ; then + echo "$pgm: error: docbook2texi not found" >&2 + exit 1 + fi + [ $verbose = yes ] && echo "$pgm: docbook2texi found" >&2 + if ! sgml2xml -v /dev/null 2>&1 | grep 'SP version' >/dev/null 2>&1 ; then + echo "$pgm: error: sgml2xml not found" >&2 + exit 1 + fi + [ $verbose = yes ] && echo "$pgm: sgml2xml found" >&2 + + # figure out where our stylesheets are + tex_stylesheet=none + for d in ${stylesheet_dirs}; do + file=${d}/print/docbook.dsl + if [ -f $file ]; then + tex_stylesheet=$file + break + fi + done + [ $verbose = yes ] && echo "$pgm: TeX stylesheet: ${tex_stylesheet}" >&2 + html_stylesheet=none + for d in ${stylesheet_dirs}; do + file=${d}/html/docbook.dsl + if [ -f $file ]; then + html_stylesheet=$file + break + fi + done + [ $verbose = yes ] && echo "$pgm: HTML stylesheet: ${html_stylesheet}" >&2 + if [ $tex_stylesheet = none -o $html_stylesheet = none ]; then + echo "$pgm: error: stylesheets not found" >&2 + exit 1 + fi + +} + + +# Render the docbook as HTML +render_html () { + output="`basename $input| sed 's/\.sgml$//'`.html" + + if [ -n "$usestyle" ]; then + tmpstyle="`pwd`/`basename $usestyle`-html.tmp" + if [ ! -f $tmpstyle -o $usestyle -nt $tmpstyle ]; then + sed "s%@DOCBOOK_DSL@%$html_stylesheet%" $usestyle > $tmpstyle + fi + else + tmpstyle="$tex_stylesheet" + fi + + + # --nosplts creates just one HTML file + if test $nosplit = yes; then + echo "running jade on '$input' ..." >&2 + jade -D . -d $tmpstyle -t sgml -i html -V nochunks $input > $output + echo "$output created" + return 0 + fi + + # Make sure that we have a html subdir + if test -d html ; then + : + else + if mkdir html; then + echo "'html' directory created" >&2 + else + echo "failed to create 'html' directory" >&2 + exit 1 + fi + fi + + outputdir="html/`basename $input| sed 's/\.sgml$//'`" + + if test -d $outputdir ; then + : + else + if mkdir $outputdir; then + echo "'$outputdir' created" >&2 + else + echo "failed to create '$outputdir'" >&2 + exit 1 + fi + fi + echo "creating html pages in '$outputdir' ..." >&2 + if test "$input" = "`basename $input`"; then + inp="../../$input" + else + inp="$input" + fi + + [ $verbose = yes ] && echo "running jade on '$inp' ..." >&2 + (cd $outputdir && jade -D . -t sgml -i html -d $tmpstyle $inp ) + [ $verbose = yes ] && echo "html version in '$outputdir' created" >&2 + + # break out all filerefs and copy them to the outputdirectory + # fixme: handling of path components is wrong + if test $copyfiles = yes; then + echo "looking for filerefs ..." >&2 + for file in `nsgmls -i html $input \ + | awk '/^AFILEREF[ \t]+CDATA/ {print $3}'`; do + d=$outputdir/`basename $file` + if cat $file > $outputdir/`basename $file` ; then + echo " $file -> $d" >&2 + fi + done + fi + + mainfile=`ls $outputdir/${doctype}* | head -1` + + # create a html index file for it, so that we can more easy + # find the rendred pages + cat > $output <<EOF +<html><title>$output</title> +<body> + +<a href="$mainfile">$mainfile</a> + +</body> +</html> +EOF + + [ $verbose = yes ] && echo "$output created with link to '$mainfile'" >&2 +} + + +# This function expects the source file in $texfile and +# the name of the logfle in $logfile +run_jadetex () { + [ -f $logfile ] && rm $logfile + jadetex $texfile + if ! tail $logfile | grep -q '^Output written on'; then + echo "JadeTeX failed" >&2 + exit 1 + fi +} + +# Render the docbook to DVI +render_dvi () { + output="`basename $input| sed 's/\.sgml$//'`.dvi" + texfile="`basename $input| sed 's/\.sgml$//'`.tex" + logfile="`basename $input| sed 's/\.sgml$//'`.log" + auxfile="`basename $input| sed 's/\.sgml$//'`.aux" + + if [ -n "$usestyle" ]; then + tmpstyle="`basename $usestyle`-tex.tmp" + if [ ! -f $tmpstyle -o $usestyle -nt $tmpstyle ]; then + sed "s%@DOCBOOK_DSL@%$tex_stylesheet%" $usestyle > $tmpstyle + fi + else + tmpstyle="$tex_stylesheet" + fi + [ $verbose = yes ] && echo "running jade on '$input' ..." >&2 + jade -D . -t tex -i tex -d $tmpstyle -o $texfile $input + if ! tail $texfile | grep -q '\\endFOT{}'; then + echo "Jade failed" >&2 + exit 1 + fi + + # Better delete the aux file first + [ -f $auxfile ] && rm $auxfile + # The first run won't get the references right, so we have to + # run it 2 or 3 times. JadeTex doesn't indicate whether a third + # run is required, so we do it always. + run_jadetex + if [ $draft = no ]; then + if tail -100 $logfile \ + | grep -q '^LaTeX Warning: There were undefined references'; then + echo 'running JadeTeX a second and third 2time' >&2 + run_jadetex + run_jadetex + fi + fi + + [ $verbose = yes ] && echo "$output created as '$output'" >&2 +} + +# Render the docbook to troff +render_man () { + output="`basename $input| sed 's/\.sgml$//'`.$manvolume" + + [ $verbose = yes ] && echo "running docbook-to-man on '$input' ..." >&2 + docbook-to-man $input > $output + [ $verbose = yes ] && echo "man page '$output' created" >&2 +} + +# Render the docbook to texinfo +render_texinfo () { + output="`basename $input| sed 's/\.sgml$/.texi/'`" + tmpxml="`basename $input| sed 's/\.sgml$/.xml/'`" + + [ $verbose = yes ] && echo "running sgml2xml on '$input' ..." >&2 + sgml2xml -x lower $input > $tmpxml + [ $verbose = yes ] && echo "running docbook2texi on '$tmpxml' ..." >&2 + docbook2texi $tmpxml | sed 's,--,---,' >$output + rm $tmpxml + [ $verbose = yes ] && echo "texinfo '$output' created" >&2 + +} + +####################################### +# main function # +####################################### + +do_systemcheck +[ $systemcheck_only = yes ] && exit 0 + +if [ ! -f "$input" ]; then + input="$input.sgml" + if [ ! -f "$input" ]; then + echo "$pgm: '$input': no such file" >&2 + exit 1 + fi +fi + +# grep the document type +doctype=`grep -i '\<doctype' $input|awk 'NR==1 {print $2}'| tr '[A-Z]' '[a-z]'` +if test -z "$doctype"; then + echo "$pgm: error: no DOCTYPE declaration found" >&2 + exit 1 +fi +[ $verbose = yes ] && echo "$input: DOCTYPE is '$doctype'" >&2 + +case $mode in + check) + nsgmls -vs $input + exit $? + ;; + html) + render_html + ;; + dvi) + render_dvi + ;; + man) + render_man + ;; + texinfo) + render_texinfo + ;; +esac + + +exit 0 diff --git a/scripts/db2html.in b/scripts/db2html.in deleted file mode 100755 index ba35afbc..00000000 --- a/scripts/db2html.in +++ /dev/null @@ -1,151 +0,0 @@ -#!/bin/sh -# db2html.in - Docbook to HTML rendering (wk 2000-02-15) -# -# Copyright (C) 2000 Free Software Foundation -# -# This is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - -nosplit=no -copyfiles=no -stylesheet=@DSL_FOR_HTML@ -JADE=@JADE@ - -usage () { - echo 'usage: db2html [--nosplit] [--copyfiles] filename' >&2 - exit 1 -} - - -while test "`echo $1 | head -c1`" = "-"; do - case $1 in - --version) - cat <<EOF -db2html 0.5 -Copyright (C) 2000 Free Software Foundation, Inc. -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -stylesteet: $stylesheet -EOF - exit 0 - ;; - --help|-h|-help) - usage - ;; - --nosplit) - nosplit=yes - ;; - --copyfiles) - copyfiles=yes - ;; - --) - shift - break - ;; - *) - echo "invalid option $1" >&2 - exit 1 - ;; - esac - shift -done - -if test $# = 1; then - input="$1" -else - usage -fi - -# grep the document type -doctype=`grep -i '\<doctype' $input|awk 'NR==1 {print $2}'| tr '[A-Z]' '[a-z]'` -if test -z $doctype; then - doctype=book - echo "no DOCTYPE found - assuming '$doctype'" >&2 -else - echo "DOCTYPE is '$doctype'" >&2 -fi - -output="`basename $input| sed 's/\.sgml$//'`.html" - - -if test $nosplit = yes; then - echo "running jade on '$input' ..." >&2 - $JADE -d $stylesheet -t sgml -i html -V nochunks $input > $output - echo "$output created" - exit 0 -fi - -if test -d html ; then - : -else - if mkdir html; then - echo "'html' directory created" >&2 - else - echo "failed to create 'html' directory" >&2 - exit 1 - fi -fi - -outputdir="html/`basename $input| sed 's/\.sgml$//'`" - -if test -d $outputdir ; then - : -else - if mkdir $outputdir; then - echo "'$outputdir' created" >&2 - else - echo "failed to create '$outputdir'" >&2 - exit 1 - fi -fi -echo "creating html pages in '$outputdir' ..." >&2 -if test "$input" = "`basename $input`"; then - inp="../../$input" -else - inp="$input" -fi -echo "running jade on '$inp' ..." >&2 -(cd $outputdir && $JADE -t sgml -i html -d $stylesheet $inp ) -echo "html version in '$outputdir' created" >&2 - -# break out all filerefs and copy them to the outputdirectory -# fixme: handling of path components is wrong -if test $copyfiles = yes; then - echo "looking for filerefs ..." >&2 - for file in `nsgmls -i html $input \ - | awk '/^AFILEREF[ \t]+CDATA/ {print $3}'`; do - d=$outputdir/`basename $file` - if cat $file > $outputdir/`basename $file` ; then - echo " $file -> $d" >&2 - fi - done -fi - -mainfile=`ls $outputdir/${doctype}* | head -1` - -cat > $output <<EOF -<html><title>$output</title> -<body> - -<a href="$mainfile">$mainfile</a> - -</body> -</html> -EOF - -echo "$output created with link to '$mainfile'" >&2 - -exit 0 - diff --git a/scripts/distfiles b/scripts/distfiles index 56cf2172..2d79a5b7 100644 --- a/scripts/distfiles +++ b/scripts/distfiles @@ -7,5 +7,5 @@ autogen.sh ChangeLog ltconfig ltmain.sh -db2html.in +db2any diff --git a/src/ChangeLog b/src/ChangeLog index 37e402a6..1d5f769b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2001-05-28 Werner Koch <wk@gnupg.org> + + * libgcrypt.m4: Check GCRYPT_VERSION macro and not LIBGCRYPT_VERSION. + + * mpi.h: Removed mpi_fromstr prototype. + 2001-01-11 Werner Koch <wk@gnupg.org> * Makefile.am (libgcrypt_la_SOURCES): Add mpi.h diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 index d6806f5e..6bd1784f 100644 --- a/src/libgcrypt.m4 +++ b/src/libgcrypt.m4 @@ -70,9 +70,9 @@ main () printf("*** to point to the correct copy of libgcrypt-config, and remove the file config.cache\n"); printf("*** before re-running configure\n"); } - else if ( strcmp(gcry_check_version(NULL), LIBGCRYPT_VERSION ) ) + else if ( strcmp(gcry_check_version(NULL), GCRYPT_VERSION ) ) { - printf("\n*** LIBGCRYPT header file (version %s) does not match\n", LIBGCRYPT_VERSION); + printf("\n*** LIBGCRYPT header file (version %s) does not match\n", GCRYPT_VERSION); printf("*** library (version %s)\n", gcry_check_version(NULL) ); } else @@ -107,7 +107,6 @@ void mpi_m_check( MPI a ); void mpi_swap( MPI a, MPI b); /*-- mpicoder.c --*/ -int mpi_fromstr(MPI val, const char *str); void g10_log_mpidump( const char *text, MPI a ); u32 mpi_get_keyid( MPI a, u32 *keyid ); byte *mpi_get_buffer( MPI a, unsigned *nbytes, int *sign ); |