diff options
author | Werner Koch <wk@gnupg.org> | 1999-02-19 14:53:57 +0000 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 1999-02-19 14:53:57 +0000 |
commit | dc85239826a23ddcbef89206831f492a4a23f69e (patch) | |
tree | 70d6c7c86558ac9e5f14c8b77dd1b4b71f89bf53 | |
parent | 788077d888e7b95448ed8c1a84d7e5d6b9244d9f (diff) | |
download | libgcrypt-dc85239826a23ddcbef89206831f492a4a23f69e.tar.gz |
See ChangeLog: Fri Feb 19 15:49:15 CET 1999 Werner Koch
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | acinclude.m4 | 326 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | src/Makefile.am | 19 | ||||
-rw-r--r-- | src/gcrypt.h | 16 | ||||
-rw-r--r-- | src/global.c | 4 | ||||
-rw-r--r-- | src/misc.c | 6 | ||||
-rw-r--r-- | src/symapi.c | 6 |
8 files changed, 37 insertions, 346 deletions
@@ -1,3 +1,7 @@ +Fri Feb 19 15:49:15 CET 1999 Werner Koch <wk@isil.d.shuttle.de> + + * acinclude.m4: Removed gettext macros. + Tue Feb 16 14:10:02 CET 1999 Werner Koch <wk@isil.d.shuttle.de> * configure.in (socket): Check for -lsocket and -lnsl. diff --git a/acinclude.m4 b/acinclude.m4 index 496624c8..2349da62 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,4 +1,4 @@ -dnl macros to configure g10 7cache_va +dnl macros to configure g10 dnl GNUPG_MSG_PRINT(STRING) @@ -343,328 +343,4 @@ define(GNUPG_CHECK_MLOCK, ]) - - - - - - -# Macro to add for using GNU gettext. -# Ulrich Drepper <drepper@cygnus.com>, 1995. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -# serial 5 + patch (wk 21.10.98) - -AC_DEFUN(AM_WITH_NLS, - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) - - USE_INCLUDED_LIBINTL=no - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) - - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If gettext or catgets are available (in this order) we - dnl use this. Else we have to fall back to GNU NLS library. - dnl catgets is only used if permitted by option --with-catgets. - nls_cv_header_intl= - nls_cv_header_libgt= - CATOBJEXT=NONE - - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, - [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")], - gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - - if test "$gt_cv_func_gettext_libc" != "yes"; then - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CHECK_LIB(intl, gettext, - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)]) - fi - - if test "$gt_cv_func_gettext_libintl" = "yes" ; then - LIBS="-lintl $LIBS" - fi - - if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - INSTOBJEXT=.mo - fi - fi - ]) - - if test "$CATOBJEXT" = "NONE"; then - AC_MSG_CHECKING([whether catgets can be used]) - AC_ARG_WITH(catgets, - [ --with-catgets use catgets functions if available], - nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) - AC_MSG_RESULT($nls_cv_use_catgets) - - if test "$nls_cv_use_catgets" = "yes"; then - dnl No gettext in C library. Try catgets next. - AC_CHECK_LIB(i, main) - AC_CHECK_FUNC(catgets, - [AC_DEFINE(HAVE_CATGETS) - INTLOBJS="\$(CATOBJS)" - AC_PATH_PROG(GENCAT, gencat, no)dnl - if test "$GENCAT" != "no"; then - AC_PATH_PROG(GMSGFMT, gmsgfmt, no) - if test "$GMSGFMT" = "no"; then - AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) - fi - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi]) - fi - fi - - if test "$CATOBJEXT" = "NONE"; then - dnl Neither gettext nor catgets in included in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi - fi - - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_SUBST(MSGFMT) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi - - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - fi - - # We need to process the po/ directory. - POSUB=po - else - DATADIRNAME=share - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi - AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) - - - # If this is used in GNU gettext we have to set USE_NLS to `yes' - # because some of the sources are only built for this goal. - if test "$PACKAGE" = gettext; then - USE_NLS=yes - USE_INCLUDED_LIBINTL=yes - fi - - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) - AC_SUBST(INTLLIBS) - AC_SUBST(INTLOBJS) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - - -AC_DEFUN(AM_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ -strdup __argz_count __argz_stringify __argz_next]) - - if test "${ac_cv_func_stpcpy+set}" != "set"; then - AC_CHECK_FUNCS(stpcpy) - fi - if test "${ac_cv_func_stpcpy}" = "yes"; then - AC_DEFINE(HAVE_STPCPY) - fi - - AM_LC_MESSAGES - AM_WITH_NLS - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl The reference to <locale.h> in the installed <libintl.h> file - dnl must be resolved because we cannot expect the users of this - dnl to define HAVE_LOCALE_H. - if test $ac_cv_header_locale_h = yes; then - INCLUDE_LOCALE_H="#include <locale.h>" - else - INCLUDE_LOCALE_H="\ -/* The system does not provide the header <locale.h>. Take care yourself. */" - fi - AC_SUBST(INCLUDE_LOCALE_H) - - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format - test -d intl || mkdir intl - if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) - - dnl Transform the SED scripts while copying because some dumb SEDs - dnl cannot handle comments. - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed - fi - dnl po2tbl.sed is always needed. - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed - - dnl In the intl/Makefile.in we have a special dependency which makes - dnl only sense for gettext. We comment this out for non-gettext - dnl packages. - if test "$PACKAGE" = "gettext"; then - GT_NO="#NO#" - GT_YES= - else - GT_NO= - GT_YES="#YES#" - fi - AC_SUBST(GT_NO) - AC_SUBST(GT_YES) - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl *** For now the libtool support in intl/Makefile is not for real. - l= - AC_SUBST(l) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) - dnl *-*wedit:notab*-* Please keep this as the last line. diff --git a/configure.in b/configure.in index f912ec4e..2caa3ed0 100644 --- a/configure.in +++ b/configure.in @@ -86,7 +86,7 @@ AC_ISC_POSIX AC_PROG_RANLIB AC_PROG_INSTALL dnl AC_CYGWIN32 - +dnl AM_PROG_LIBTOOL MPI_OPT_FLAGS="" if test "$GCC" = yes; then diff --git a/src/Makefile.am b/src/Makefile.am index b000ecc2..d8f8beca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,16 +2,17 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -LIBRARIES = libgcrypt.a +lib_LTLIBRARIES = libgcrypt.la -SOURCES = gcrypt.h \ - g10lib.h \ - misc.c \ - global.c \ - mpiapi.c \ - symapi.c \ - mdapi.c \ - pkapi.c \ +libgcrypt_la_LDFLAGS = -version-info 0:0:0 +libgcrypt_la_SOURCES = gcrypt.h \ + g10lib.h \ + misc.c \ + global.c \ + mpiapi.c \ + symapi.c \ + mdapi.c \ + pkapi.c diff --git a/src/gcrypt.h b/src/gcrypt.h index 5ac84421..37947027 100644 --- a/src/gcrypt.h +++ b/src/gcrypt.h @@ -25,6 +25,12 @@ extern "C" { #endif +#ifndef HAVE_BYTE_TYPEDEF + #undef byte /* maybe there is a macro with this name */ + typedef unsigned char byte; + #define HAVE_BYTE_TYPEDEF +#endif + /******************************************* * * * error handling etc. * @@ -33,7 +39,7 @@ extern "C" { enum { GCRYERR_SUCCESS = 0, /* "no error" */ - GCRYERR_GENERAL = 1 /* catch all the other errors code */ + GCRYERR_GENERAL = 1, /* catch all the other errors code */ GCRYERR_INV_OP = 2, /* invalid operation code or ctl command */ GCRYERR_NOMEM = 3, /* out of core */ GCRYERR_INV_ALGO = 4, /* invalid algorithm */ @@ -87,7 +93,7 @@ struct gcry_mpi *gcry_mpi_new( enum gcry_mpi_opcode opcode, #ifndef GCRYPT_NO_MPI_MACROS #define mpi_new( nbits ) gcry_mpi_new( GCRYMPI_NEW, (nbits), NULL ) #define mpi_secure_new( nbits ) gcry_mpi_new( GCRYMPI_SNEW, (nbits), NULL ) -#define mpi_release( a ) do { gcry_mpi_api( GCRYMPI_RELEASE, 1, (a) ); +#define mpi_release( a ) do { gcry_mpi_api( GCRYMPI_RELEASE, 1, (a) ); \ (a) = NULL; } while(0) #define mpi_resize( a, n ) gcry_mpi_api( GCRYMPI_RESIZE, 2, (a), (n) ) #define mpi_copy( a ) gcry_mpi_new( GCRYMPI_COPY, 0, (a) ) @@ -101,7 +107,7 @@ struct gcry_mpi *gcry_mpi_new( enum gcry_mpi_opcode opcode, /* int mpi_cmp_ui( MPI u, unsigned long v ); */ #define mpi_cmp_ui( u, v ) gcry_mpi_api( GCRYMPI_CMP_UI, 2, (u), (v) ) - +#if 0 void g10m_add(MPI w, MPI u, MPI v); void g10m_add_ui(MPI w, MPI u, unsigned long v ); void g10m_sub( MPI w, MPI u, MPI v); @@ -123,7 +129,7 @@ unsigned g10m_get_nbits( MPI a ); unsigned g10m_get_size( MPI a ); void g10m_set_buffer( MPI a, const char *buffer, unsigned nbytes, int sign ); - +#endif #endif /* GCRYPT_NO_MPI_MACROS */ @@ -164,7 +170,7 @@ unsigned gcry_cipher_get_keylen( int algo ); unsigned gcry_cipher_get_blocksize( int algo ); #endif -GCRY_CIPHER_HD gcry_cipher_open( algo, int mode, int secure ); +GCRY_CIPHER_HD gcry_cipher_open( int algo, int mode, unsigned flags ); void gcry_cipher_close( GCRY_CIPHER_HD h ); int gcry_cipher_ctl( GCRY_CIPHER_HD h, int cmd, byte *buffer, size_t buflen); diff --git a/src/global.c b/src/global.c index 7541a932..7c5e21b8 100644 --- a/src/global.c +++ b/src/global.c @@ -33,19 +33,21 @@ static int last_ec; /* fixme: make thread safe */ int gcry_control( enum gcry_ctl_cmds cmd, ... ) { + #if 0 switch( cmd ) { case GCRYCTL_NO_MEM_IS_FATAL: break; case GCRYCTL_SET_FATAL_FNC: break; } + #endif return GCRYERR_INV_OP; } int gcry_errno() { - return ec; + return last_ec; } const char* @@ -42,9 +42,9 @@ g10_gettext( const char *key ) * handler. The caller might want to use his own. */ int -fatal_invalid_arg(const char *text); +fatal_invalid_arg(const char *text) { - log_error("Fatal error: %s\n", text ); - return G10ERR_INV_ARG; + /*log_error("Fatal error: %s\n", text );*/ + return GCRYERR_INV_ARG; } diff --git a/src/symapi.c b/src/symapi.c index 75bf1a4d..ffe967a5 100644 --- a/src/symapi.c +++ b/src/symapi.c @@ -28,15 +28,17 @@ #include <assert.h> #include "g10lib.h" +#define G10_MPI_H /* fake mpi.h header */ #include "cipher.h" -#define CONTEXT_MAGIC = 0x12569afe; +#define CONTEXT_MAGIC 0x12569afe struct gcry_cipher_context { u32 magic; + int mode; unsigned flags; - CIPHER_HD *hd; + CIPHER_HANDLE hd; }; |