Hello community, here is the log from the commit of package aqbanking for openSUSE:Factory checked in at 2016-01-15 10:41:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqbanking (Old) and /work/SRC/openSUSE:Factory/.aqbanking.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aqbanking" Changes: -------- --- /work/SRC/openSUSE:Factory/aqbanking/aqbanking.changes 2015-11-22 11:02:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.aqbanking.new/aqbanking.changes 2016-01-15 10:41:35.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Jan 13 14:58:17 UTC 2016 - [email protected] + +- Update to 5.6.4beta + + Fix error in SWIFT importer (missing import of :NS: fields) + + Fix transmission of Flicker codes (HHD 1.4) + +------------------------------------------------------------------- Old: ---- aqbanking-5.6.1beta.tar.gz New: ---- aqbanking-5.6.4beta.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqbanking.spec ++++++ --- /var/tmp/diff_new_pack.qHPpBp/_old 2016-01-15 10:41:36.000000000 +0100 +++ /var/tmp/diff_new_pack.qHPpBp/_new 2016-01-15 10:41:36.000000000 +0100 @@ -26,7 +26,7 @@ %define q4b_cfgmoddir %{fronts_libdir}/q4banking/cfgmodules Name: aqbanking -Version: 5.6.1beta +Version: 5.6.4beta Release: 0 Summary: Library for Online Banking Functions and Financial Data Import and Export License: GPL-2.0 or GPL-3.0 ++++++ aqbanking-5.6.1beta.tar.gz -> aqbanking-5.6.4beta.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/ChangeLog new/aqbanking-5.6.4beta/ChangeLog --- old/aqbanking-5.6.1beta/ChangeLog 2015-06-01 19:21:40.000000000 +0200 +++ new/aqbanking-5.6.4beta/ChangeLog 2016-01-07 20:50:50.000000000 +0100 @@ -1,4 +1,112 @@ ------------------------------------------------------------------ +2016-01-07 20:49:24 +0100 Martin Preuss +Prepared release 5.6.4beta. + +------------------------------------------------------------------ +2016-01-07 20:43:08 +0100 Martin Preuss +Fixed a bug in XML description file. +I don't know where this bug comes from... It leads to the secProfile/version +being put into the HNVSK segment multiple times... + +The netbank server is quite gentle about this as it just ignores the additional +elements, other servers aren't that forgiving. + +------------------------------------------------------------------ +2016-01-06 19:23:02 +0100 Martin Preuss +Work on bug #190. + +------------------------------------------------------------------ +2015-12-27 13:31:01 +0100 Martin Preuss +AqHBCI: Use the correct mode specification in HNVSK for PIN/TAN. + +------------------------------------------------------------------ +2015-12-27 13:30:23 +0100 Martin Preuss +Added some remarks. + +------------------------------------------------------------------ +2015-12-20 20:45:34 +0100 Martin Preuss +Fixed a "off-by-one" error (report and patch by Martin Kuehn, thanks!!). + +------------------------------------------------------------------ +2015-12-20 17:42:34 +0100 Martin Preuss +AqHBCI: Work on job AH_Job_SepaStandingOrdersGet. +The job should now be able to import standings orders. The next step will +be to create an importer for various SEPA formats (starting with +PAIN 001.001.02 because that's what my bank delivers). + +------------------------------------------------------------------ +2015-12-20 17:40:50 +0100 Martin Preuss +Removed umlaut from comment (messes with eFTE). + +------------------------------------------------------------------ +2015-12-15 18:00:10 +0100 Martin Preuss +Reorganized some file in aqhbci. +Each code file should be compiled by its own, including of source files +should be minimized. + +------------------------------------------------------------------ +2015-11-17 12:22:49 -0500 R.Weiner +Deleted Comments (superfluous) in HKCDL +Delete test-printf() in jobsepastandingordercreate.c + +------------------------------------------------------------------ +2015-11-13 21:08:40 +0100 Martin Preuss +Prepared release 5.6.3beta. + +------------------------------------------------------------------ +2015-10-27 16:47:38 -0400 R.Weiner +NEW: HKCDL for SEPA + Patch (sequential of '0000-NEW-HKCDL-for-SEPA.patch') + 5 Files added. + +------------------------------------------------------------------ +2015-10-27 16:47:38 -0400 R.Weiner +NEW: HKCDL for SEPA + Use of aqbanking-cli sepacreatesto for HKCDE and HKCDL: + HKCDE: aqbanking-cli sepacreatesto .. + HKCDL: aqbanking-cli sepacreatesto .. --fiId=<xxx> + In separecurtransfer.c you can find a new if-else-statment to distinguish + between CreateStandingOrder and DeleteStandingOrder. + +------------------------------------------------------------------ +2015-11-13 20:26:36 +0100 Martin Preuss +Fixed last patch (fixed mixing of variable definitions and code). + +------------------------------------------------------------------ +2015-11-13 20:24:09 +0100 Martin Preuss +Applied a patch submitted by martin.m.kuehn. + +------------------------------------------------------------------ +2015-11-09 22:36:44 +0100 Martin Preuss +Prepared release 5.6.2beta. + +------------------------------------------------------------------ +2015-11-09 22:35:37 +0100 Martin Preuss +Fixed another bug in HHD code for version 1.4 (as suggested by Martin Kuehn). + +------------------------------------------------------------------ +2015-11-06 23:26:07 +0100 Martin Preuss +Fixed a bug in HHD1.4 flicker code setup. + +------------------------------------------------------------------ +2015-10-26 19:43:02 +0100 Martin Preuss +Adjusted size of challengeHUD field. + +------------------------------------------------------------------ +2015-07-13 21:42:48 +0200 Micha Lenk +Make contents of listdoc.h reproducible +There is a Debian initiative working on making builds reproducible, i.e. to +make it possible to reproduce byte-for-byte identical binary packages from a +given source. https://wiki.debian.org/ReproducibleBuilds + +The contents of listdoc.h is generated by the output of "find include -name +'*.h'". Unfortunately the output of this command depends on readdir()'s output, +which in general is non-deterministic. Under some yet unknown conditions this +can result in unreproducible API documentation for Gwenhywfar. By sorting the +output of "find" the generated API documentation should become reliably +reproducible. + +------------------------------------------------------------------ 2015-06-01 19:16:43 +0200 Martin Preuss Disabled debug output again. @@ -456,111 +564,3 @@ git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2591 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-06-08 20:22:55 +0000 mlenk -Update Subversion's svn:ignore attributes -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2590 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-29 15:55:59 +0000 martin -SWIFT parser: Ignore doc tag 21 when content is "NONREF"(by Ludolf Holzheid) -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2589 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-23 20:20:39 +0000 martin -AqHBCI-Tool4: Add user as an option to the sendkeys command (Elias Oltmanns). -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2588 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-23 20:16:43 +0000 martin -AqHBCI: Make sure that the size (in bits) of RDH-10 keys is a multiple of 8 (Elias Oltmanns). -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2587 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-21 19:09:06 +0000 martin -AqHBCI: Fixed previous patch. -Previous 4 patches provided by Elias Oltmanns (need to find a way to easily -put the real patch author in SVN logs when using "git svn"). - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2586 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-21 19:07:54 +0000 martin -AqHBCI: Generate RDH-10 keys of the same size as the server's keys. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2585 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-21 19:06:43 +0000 martin -SEPA exporter: Avoid unjustified usage of callbacks (portability issues). -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2584 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-21 19:05:32 +0000 martin -Keep the logic for choosing teh right SEPA profile inside AqHBCI. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2583 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-21 19:04:07 +0000 martin -Fix usage of GWEN_Text_ComparePattern(). -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2582 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-19 17:07:06 +0000 martin -Increased log output in AH_Job_GetAccountSepaInfo_Process() -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2581 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-17 14:29:34 +0000 martin -Do not accept lower case letters in BIC. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2580 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-17 14:28:23 +0000 martin -AqHBCI: Do not free AH_JOBs as long as there are AB_JOBs linked to them. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2579 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-17 14:27:11 +0000 martin -AqHBCI: Properly exchange results of SEPA multi jobs. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2578 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-17 14:24:16 +0000 martin -Add support for IBAN only transactions. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2577 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-17 14:22:59 +0000 martin -AqHBCI: Fix a typo and some comments in the xml file for COR1 single debitnotes. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2576 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-17 14:21:47 +0000 martin -AqHBCI: Actually use the flag AH_BANK_FLAGS_SEPA_PREFER_SINGLE_DEBITNOTE. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2575 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-17 14:20:35 +0000 martin -AqHBCI: Add support for SEPA multi transfers. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2574 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-17 14:19:19 +0000 martin -AqHBCI: Some jobs listed in the bpd may still be disabled on specific accounts. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2573 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-17 14:18:07 +0000 martin -Handle batch booking requests for SEPA jobs. -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2572 5c42a225-8b10-0410-9873-89b7810ad06e - ------------------------------------------------------------------- -2014-05-17 14:16:52 +0000 martin -AqHBCI: Simply look up multi-jobs by their job names -Since the SEPA exporter now graciously handles batches of -transactions, the algorithm on the job level can be significantly -simplified. In fact, the same rules apply to SEPA and traditional -multi-jobs now. - -git-svn-id: https://devel.aqbanking.de/svn/aqbanking/trunk@2571 5c42a225-8b10-0410-9873-89b7810ad06e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/Makefile.am new/aqbanking-5.6.4beta/Makefile.am --- old/aqbanking-5.6.1beta/Makefile.am 2014-08-03 23:06:06.000000000 +0200 +++ new/aqbanking-5.6.4beta/Makefile.am 2015-10-26 19:43:24.000000000 +0100 @@ -36,7 +36,7 @@ cmakeconfig_DATA = aqbanking-config.cmake aqbanking-config-version.cmake listdoc.h: - $(gwenhywfar_bindir)/mklistdoc -I $(gwenhywfar_headers) -v `find $(aqbanking_symlinkdir) -name '*.h' ` >listdoc.h + $(gwenhywfar_bindir)/mklistdoc -I $(gwenhywfar_headers) -v `find $(aqbanking_symlinkdir) -name '*.h' | LC_ALL=C sort ` >listdoc.h srcdoc: Doxyfile listdoc.h if test -d apidoc; then rm -Rf apidoc; fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/Makefile.in new/aqbanking-5.6.4beta/Makefile.in --- old/aqbanking-5.6.1beta/Makefile.in 2015-06-01 18:31:28.000000000 +0200 +++ new/aqbanking-5.6.4beta/Makefile.in 2016-01-07 20:44:44.000000000 +0100 @@ -1249,7 +1249,7 @@ chmod a+x aqbanking-config listdoc.h: - $(gwenhywfar_bindir)/mklistdoc -I $(gwenhywfar_headers) -v `find $(aqbanking_symlinkdir) -name '*.h' ` >listdoc.h + $(gwenhywfar_bindir)/mklistdoc -I $(gwenhywfar_headers) -v `find $(aqbanking_symlinkdir) -name '*.h' | LC_ALL=C sort ` >listdoc.h srcdoc: Doxyfile listdoc.h if test -d apidoc; then rm -Rf apidoc; fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/aqbanking.iss new/aqbanking-5.6.4beta/aqbanking.iss --- old/aqbanking-5.6.1beta/aqbanking.iss 2015-06-01 18:31:40.000000000 +0200 +++ new/aqbanking-5.6.4beta/aqbanking.iss 2016-01-07 20:45:09.000000000 +0100 @@ -8,7 +8,7 @@ [Setup] ; Using the name here directly because we want it capitalized AppName=AqBanking -AppVerName=AqBanking 5.6.1beta +AppVerName=AqBanking 5.6.4beta AppPublisher=AqBanking Development Team AppPublisherURL=http://sourceforge.net/projects/aqbanking AppSupportURL=http://sourceforge.net/support/getsupport.php?group_id=115695 @@ -18,7 +18,7 @@ DirExistsWarning=no InfoAfterFile=README LicenseFile=COPYING -OutputBaseFilename=aqbanking-5.6.1beta-setup +OutputBaseFilename=aqbanking-5.6.4beta-setup OutputDir=. UninstallFilesDir={app}\uninstall\aqbanking @@ -151,7 +151,7 @@ StringChange(FileString, '@'+'aqbanking_pkgdatadir@', pkgdatadir); StringChange(FileString, '@'+'AQBANKING_VERSION_MAJOR@', '5'); StringChange(FileString, '@'+'AQBANKING_VERSION_MINOR@', '6'); - StringChange(FileString, '@'+'AQBANKING_VERSION_PATCHLEVEL@', '1'); + StringChange(FileString, '@'+'AQBANKING_VERSION_PATCHLEVEL@', '4'); StringChange(FileString, '@'+'AQBANKING_VERSION_BUILD@', '0'); StringChange(FileString, '@'+'AQBANKING_VERSION_TAG@', 'beta'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/aqbanking.spec new/aqbanking-5.6.4beta/aqbanking.spec --- old/aqbanking-5.6.1beta/aqbanking.spec 2015-06-01 18:31:40.000000000 +0200 +++ new/aqbanking-5.6.4beta/aqbanking.spec 2016-01-07 20:45:09.000000000 +0100 @@ -2,7 +2,7 @@ # neededforbuild gwenhywfar gwenhywfar-devel ktoblzcheck python python-ctypes pyyxml libchipcard2-devel libchipcard2 pkgconfig gettext-devel libacl-devel libacl libattr-devel libattr %define name aqbanking -%define version 5.6.1beta +%define version 5.6.4beta %define dist Ubuntu %define disttag ubuntu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/configure new/aqbanking-5.6.4beta/configure --- old/aqbanking-5.6.1beta/configure 2015-06-01 18:31:32.000000000 +0200 +++ new/aqbanking-5.6.4beta/configure 2016-01-07 20:44:53.000000000 +0100 @@ -2743,7 +2743,7 @@ AQBANKING_VERSION_MAJOR=5 AQBANKING_VERSION_MINOR=6 -AQBANKING_VERSION_PATCHLEVEL=1 +AQBANKING_VERSION_PATCHLEVEL=4 AQBANKING_VERSION_BUILD=0 AQBANKING_VERSION_TAG="beta" @@ -2760,7 +2760,7 @@ AQBANKING_SO_CURRENT=40 AQBANKING_SO_AGE=5 -AQBANKING_SO_REVISION=1 +AQBANKING_SO_REVISION=4 AQBANKING_SO_EFFECTIVE="`echo \$(($AQBANKING_SO_CURRENT-$AQBANKING_SO_AGE))`" # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/configure.ac new/aqbanking-5.6.4beta/configure.ac --- old/aqbanking-5.6.1beta/configure.ac 2015-06-01 18:30:35.000000000 +0200 +++ new/aqbanking-5.6.4beta/configure.ac 2016-01-07 20:44:37.000000000 +0100 @@ -25,7 +25,7 @@ AQBANKING_VERSION_MAJOR=5 AQBANKING_VERSION_MINOR=6 -AQBANKING_VERSION_PATCHLEVEL=1 +AQBANKING_VERSION_PATCHLEVEL=4 AQBANKING_VERSION_BUILD=0 dnl "stable", "rcX", "betaX", "svn" AQBANKING_VERSION_TAG="beta" @@ -43,7 +43,7 @@ AQBANKING_SO_CURRENT=40 AQBANKING_SO_AGE=5 -AQBANKING_SO_REVISION=1 +AQBANKING_SO_REVISION=4 AQBANKING_SO_EFFECTIVE="`echo \$(($AQBANKING_SO_CURRENT-$AQBANKING_SO_AGE))`" # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/i18nsources new/aqbanking-5.6.4beta/i18nsources --- old/aqbanking-5.6.1beta/i18nsources 2015-06-01 18:31:42.000000000 +0200 +++ new/aqbanking-5.6.4beta/i18nsources 2016-01-07 20:45:13.000000000 +0100 @@ -50,6 +50,7 @@ src/libs/aqbanking/jobs/jobloadcellphone.c src/libs/aqbanking/jobs/jobsepacreatesto.c src/libs/aqbanking/jobs/jobsepagetstandingorders.c +src/libs/aqbanking/jobs/jobsepadeletesto.c src/libs/aqbanking/gui/abgui.c src/libs/aqbanking/dialogs/dlg_importer.c src/libs/aqbanking/dialogs/dlg_selectbankinfo.c @@ -178,6 +179,7 @@ src/plugins/backends/aqhbci/plugin/ajobs/jobtransferbase.c src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.c src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.c +src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete.c src/plugins/backends/aqhbci/plugin/applayer/adminjobs.c src/plugins/backends/aqhbci/plugin/applayer/outbox.c src/plugins/backends/aqhbci/plugin/applayer/hhd.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/libs/aqbanking/jobs/Makefile.am new/aqbanking-5.6.4beta/src/libs/aqbanking/jobs/Makefile.am --- old/aqbanking-5.6.1beta/src/libs/aqbanking/jobs/Makefile.am 2014-08-03 19:15:43.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/libs/aqbanking/jobs/Makefile.am 2015-11-13 21:06:13.000000000 +0100 @@ -31,9 +31,8 @@ jobeutransfer_l.h \ jobloadcellphone_l.h \ jobloadcellphone_p.h \ - jobsepacreatesto.h - - + jobsepacreatesto.h \ + jobsepadeletesto.h iheaderdir=@aqbanking_headerdir_am@/aqbanking iheader_HEADERS= \ @@ -94,9 +93,8 @@ jobeutransfer.c \ jobloadcellphone.c \ jobsepacreatesto.c \ - jobsepagetstandingorders.c - - + jobsepagetstandingorders.c \ + jobsepadeletesto.c sources: for f in $(libjobs_la_SOURCES); do \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/libs/aqbanking/jobs/Makefile.in new/aqbanking-5.6.4beta/src/libs/aqbanking/jobs/Makefile.in --- old/aqbanking-5.6.1beta/src/libs/aqbanking/jobs/Makefile.in 2015-06-01 18:31:28.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/libs/aqbanking/jobs/Makefile.in 2016-01-07 20:44:45.000000000 +0100 @@ -105,7 +105,8 @@ jobmodifysto.lo jobdeletesto.lo jobcreatedatedtransfer.lo \ jobmodifydatedtransfer.lo jobdeletedatedtransfer.lo \ jobinternaltransfer.lo jobeutransfer.lo jobloadcellphone.lo \ - jobsepacreatesto.lo jobsepagetstandingorders.lo + jobsepacreatesto.lo jobsepagetstandingorders.lo \ + jobsepadeletesto.lo libjobs_la_OBJECTS = $(am_libjobs_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -495,7 +496,8 @@ jobeutransfer_l.h \ jobloadcellphone_l.h \ jobloadcellphone_p.h \ - jobsepacreatesto.h + jobsepacreatesto.h \ + jobsepadeletesto.h iheaderdir = @aqbanking_headerdir_am@/aqbanking iheader_HEADERS = \ @@ -556,7 +558,8 @@ jobeutransfer.c \ jobloadcellphone.c \ jobsepacreatesto.c \ - jobsepagetstandingorders.c + jobsepagetstandingorders.c \ + jobsepadeletesto.c all: all-am @@ -628,6 +631,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobmodifysto.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepacreatesto.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadebitnote.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadeletesto.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepaflashdebitnote.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepagetstandingorders.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepatransfer.Plo@am__quote@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepadeletesto.c new/aqbanking-5.6.4beta/src/libs/aqbanking/jobs/jobsepadeletesto.c --- old/aqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepadeletesto.c 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.6.4beta/src/libs/aqbanking/jobs/jobsepadeletesto.c 2015-11-22 23:38:15.000000000 +0100 @@ -0,0 +1,20 @@ +/*************************************************************************** + begin : Wed Jan 15 2014 + copyright : (C) 2014 by Martin Preuss + email : [email protected] + + *************************************************************************** + * This file is part of the project "AqBanking". * + * Please see toplevel file COPYING of that project for license details. * + ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#include "jobsepadeletesto.h" +#include "job_l.h" + +AB_JOB *AB_JobSepaDeleteStandingOrder_new(AB_ACCOUNT *a){ + return AB_Job_new(AB_Job_TypeSepaDeleteStandingOrder, a); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepadeletesto.h new/aqbanking-5.6.4beta/src/libs/aqbanking/jobs/jobsepadeletesto.h --- old/aqbanking-5.6.1beta/src/libs/aqbanking/jobs/jobsepadeletesto.h 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.6.4beta/src/libs/aqbanking/jobs/jobsepadeletesto.h 2015-11-22 23:38:15.000000000 +0100 @@ -0,0 +1,44 @@ +/*************************************************************************** + begin : Wed Jan 15 2014 + copyright : (C) 2014 by Martin Preuss + email : [email protected] + + *************************************************************************** + * This file is part of the project "AqBanking". * + * Please see toplevel file COPYING of that project for license details. * + ***************************************************************************/ + + +#ifndef AQBANKING_JOBSEPADELETESTO_H +#define AQBANKING_JOBSEPADELETESTO_H + + +#include <aqbanking/job.h> +#include <aqbanking/transaction.h> +#include <aqbanking/transactionlimits.h> + + +/** @addtogroup G_AB_JOBS_SEPA_STO_MK Create a SEPA Standing Order + * + */ +/*@{*/ + + +#ifdef __cplusplus +extern "C" { +#endif + + +AQBANKING_API +AB_JOB *AB_JobSepaDeleteStandingOrder_new(AB_ACCOUNT *a); + + + +#ifdef __cplusplus +} +#endif + +/*@}*/ /* defgroup */ + + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.am new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.am --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.am 2015-05-25 18:22:08.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.am 2015-12-15 17:54:41.000000000 +0100 @@ -46,8 +46,9 @@ jobsepacor1datedsinglecreate_l.h \ jobsepacor1datedsinglecreate_p.h \ jobtransferbase_l.h jobtransferbase_p.h \ - jobsepastandingordercreate_l.h jobsepastandingordercreate_p.h \ - jobsepastandingorderget_l.h jobsepastandingorderget_p.h + jobsepastandingordercreate_l.h \ + jobsepastandingorderget_l.h jobsepastandingorderget_p.h \ + jobsepastandingorderdelete_l.h libhbciaccjobs_la_SOURCES=\ accountjob.c \ @@ -69,8 +70,8 @@ jobsepacor1datedsinglecreate.c \ jobtransferbase.c \ jobsepastandingordercreate.c \ - jobsepastandingorderget.c - + jobsepastandingorderget.c \ + jobsepastandingorderdelete.c sources: @@ -107,8 +108,8 @@ $(srcdir)/jobsepadebitsingle.xml \ $(srcdir)/jobsepacor1datedsinglecreate.xml \ $(srcdir)/jobsepastandingordercreate.xml \ - $(srcdir)/jobsepastandingorderget.xml - + $(srcdir)/jobsepastandingorderget.xml \ + $(srcdir)/jobsepastandingorderdelete.xml EXTRA_DIST=$(xmlfiles) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.in new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.in --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.in 2015-06-01 18:31:29.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/Makefile.in 2016-01-07 20:44:47.000000000 +0100 @@ -106,7 +106,8 @@ jobsepadebitdatedmulticreate.lo jobsepacor1datedmulticreate.lo \ jobsepaxfermulti.lo jobsepaxfersingle.lo jobsepadebitsingle.lo \ jobsepacor1datedsinglecreate.lo jobtransferbase.lo \ - jobsepastandingordercreate.lo jobsepastandingorderget.lo + jobsepastandingordercreate.lo jobsepastandingorderget.lo \ + jobsepastandingorderdelete.lo libhbciaccjobs_la_OBJECTS = $(am_libhbciaccjobs_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -482,8 +483,9 @@ jobsepacor1datedsinglecreate_l.h \ jobsepacor1datedsinglecreate_p.h \ jobtransferbase_l.h jobtransferbase_p.h \ - jobsepastandingordercreate_l.h jobsepastandingordercreate_p.h \ - jobsepastandingorderget_l.h jobsepastandingorderget_p.h + jobsepastandingordercreate_l.h \ + jobsepastandingorderget_l.h jobsepastandingorderget_p.h \ + jobsepastandingorderdelete_l.h libhbciaccjobs_la_SOURCES = \ accountjob.c \ @@ -505,7 +507,8 @@ jobsepacor1datedsinglecreate.c \ jobtransferbase.c \ jobsepastandingordercreate.c \ - jobsepastandingorderget.c + jobsepastandingorderget.c \ + jobsepastandingorderdelete.c xmlfiles = \ $(srcdir)/jobgetbalance.xml \ @@ -533,7 +536,8 @@ $(srcdir)/jobsepadebitsingle.xml \ $(srcdir)/jobsepacor1datedsinglecreate.xml \ $(srcdir)/jobsepastandingordercreate.xml \ - $(srcdir)/jobsepastandingorderget.xml + $(srcdir)/jobsepastandingorderget.xml \ + $(srcdir)/jobsepastandingorderdelete.xml EXTRA_DIST = $(xmlfiles) CLEANFILES = accountjobs.xml @@ -607,6 +611,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadebitdatedsinglecreate.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepadebitsingle.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepastandingordercreate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepastandingorderdelete.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepastandingorderget.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepaxfermulti.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jobsepaxfersingle.Plo@am__quote@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.c new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.c --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.c 2014-08-20 21:45:01.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate.c 2015-12-15 17:51:59.000000000 +0100 @@ -13,7 +13,7 @@ #endif -#include "jobsepastandingordercreate_p.h" +#include "jobsepastandingordercreate_l.h" #include "jobtransferbase_l.h" #include "aqhbci_l.h" #include "accountjob_l.h" @@ -35,9 +35,6 @@ - - - /* --------------------------------------------------------------- FUNCTION */ AH_JOB *AH_Job_SepaStandingOrderCreate_new(AB_USER *u, AB_ACCOUNT *account) { AH_JOB *j; @@ -379,12 +376,15 @@ "details/executionDay", AB_Transaction_GetExecutionDay(t)); - return 0; -} - - - - - + /* SET fiId, if present */ + s=AB_Transaction_GetFiId(t); + if (s) { + GWEN_DB_SetCharValue(dbArgs, + GWEN_DB_FLAGS_OVERWRITE_VARS, + "fiId", + AB_Transaction_GetFiId(t)); + } + return 0; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_l.h new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_l.h --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_l.h 2014-08-20 21:45:01.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_l.h 2015-12-15 17:51:29.000000000 +0100 @@ -18,6 +18,13 @@ AH_JOB *AH_Job_SepaStandingOrderCreate_new(AB_USER *u, AB_ACCOUNT *account); +int AH_Job_SepaStandingOrderCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); +int AH_Job_SepaStandingOrderCreate_ExchangeArgs(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); + +int AH_Job_SepaStandingOrderCreate_Prepare(AH_JOB *j); +int AH_Job_SepaStandingOrderCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); + + #endif /* AH_JOBSEPASTANDINGORDERCREATE_L_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_p.h new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_p.h --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_p.h 2014-08-20 21:45:01.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingordercreate_p.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -/*************************************************************************** - begin : Wed Jan 15 2014 - copyright : (C) 2014 by Martin Preuss - email : [email protected] - - *************************************************************************** - * Please see toplevel file COPYING for license details * - ***************************************************************************/ - - -#ifndef AH_JOBSEPASTANDINGORDERCREATE_P_H -#define AH_JOBSEPASTANDINGORDERCREATE_P_H - - -#include "jobsepastandingordercreate_l.h" - -#include <gwenhywfar/db.h> - - -static int AH_Job_SepaStandingOrderCreate_ExchangeParams(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); -static int AH_Job_SepaStandingOrderCreate_ExchangeArgs(AH_JOB *j, AB_JOB *bj, AB_IMEXPORTER_CONTEXT *ctx); - -static int AH_Job_SepaStandingOrderCreate_Prepare(AH_JOB *j); -static int AH_Job_SepaStandingOrderCreate_AddChallengeParams(AH_JOB *j, int hkTanVer, GWEN_DB_NODE *dbMethod); - - -#endif /* AH_JOBSEPASTANDINGORDERCREATE_P_H */ - - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete.c new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete.c --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete.c 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete.c 2015-12-15 17:52:39.000000000 +0100 @@ -0,0 +1,45 @@ +/*************************************************************************** + begin : Wed Jan 15 2014 + copyright : (C) 2014 by Martin Preuss + email : [email protected] + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + + +#include "jobsepastandingorderdelete_l.h" +#include "jobsepastandingordercreate_l.h" +#include "jobtransferbase_l.h" + + + + +/* --------------------------------------------------------------- FUNCTION */ + +AH_JOB *AH_Job_SepaStandingOrderDelete_new(AB_USER *u, AB_ACCOUNT *account) { + AH_JOB *j; + + j=AH_Job_TransferBase_new("JobSepaStandingOrderDelete", + AB_Transaction_TypeSepaTransfer, + AB_Transaction_SubTypeStandingOrder, + u, account); + if (!j) + return 0; + + AH_Job_SetChallengeClass(j, 35); + + /* overwrite some virtual functions (use those from AH_Job_SepaStandingOrderCreate) */ + AH_Job_SetPrepareFn(j, AH_Job_SepaStandingOrderCreate_Prepare); + AH_Job_SetAddChallengeParamsFn(j, AH_Job_SepaStandingOrderCreate_AddChallengeParams); + + /* overwrite virtual functions of transferBase class */ + AH_Job_TransferBase_SetExchangeParamsFn(j, AH_Job_SepaStandingOrderCreate_ExchangeParams); + AH_Job_TransferBase_SetExchangeArgsFn(j, AH_Job_SepaStandingOrderCreate_ExchangeArgs); + + return j; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete.xml new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete.xml --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete.xml 2015-12-20 14:49:26.000000000 +0100 @@ -0,0 +1,77 @@ + + +<SEGs> + + + <!-- + ------------------------------------------------------------- + Geschaeftsvorfall: SEPA Dauerauftrag loeschen (Version 1) + ------------------------------------------------------------- + --> + + + <!-- Kundennachricht --> + <SEGdef id="SepaStandingOrderDelete" + code="HKCDL" + version="1" + delimiter="+" + terminator="'" + > + <GROUP type="SegHead" name="head" /> + <GROUP type="kti_i_forced_sepa" version="1" /> + + <ELEM name="descriptor" type="ascii" maxsize="256" /> + <ELEM name="transfer" type="bin" trustlevel="4" /> + <ELEM name="xnextExecutionDate" type="date" minnum="0" /> + <ELEM name="fiId" type="ascii" minnum="0" /> + + <GROUP type="SepaStoSpecial" name="details" /> + <VALUES> + <VALUE path="head/code">%code</VALUE> + <VALUE path="head/version">%version</VALUE> + </VALUES> + + </SEGdef> + + + <!-- keine Banknachricht HICDL --> + + <!-- Beschreibungssegment HICDLS --> + <SEGdef code="HICDLS" version="1" + delimiter=":" terminator="'" isbpdjob="1" > + <GROUP type="BPDJob" version="2" /> <!-- Maximale Anzahl der Auftraege, Min. Anzahl der Signaturen, Sicherheitsklasse --> + + <ELEM name="mindelay" type="num" maxsize="4" /> <!-- Minimale Vorlaufzeit --> + <ELEM name="maxdelay" type="num" maxsize="4" /> <!-- Maximale Vorlaufzeit --> + <ELEM name="AllowedDate" type="an" maxsize="1" /> <!-- Loeschung terminierbar --> + <ELEM name="SendJob" type="an" maxsize="1" /> <!-- SendJob: Senden der Auftragsdaten erforderlich --> + + <VALUES> + <VALUE path="head/code">%code</VALUE> + <VALUE path="head/version">%version</VALUE> + </VALUES> + </SEGdef> + +</SEGs> + + +<JOBs> + + <!-- Geschaeftsvorfall: SEPA Dauerauftrag loeschen (Version 1) --> + <JOBdef id="JobSepaStandingOrderDelete" + code="HKCDL" + params="HICDLS" + version="1" + crypt="1" + sign="1" + needBPD="1" + > <!-- keine Response --> + + <SEG type="SepaStandingOrderDelete" version="1" /> + <VALUES> + <VALUE path="head/code">%code</VALUE> + <VALUE path="head/version">%version</VALUE> + </VALUES> + </JOBdef> + +</JOBs> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete_l.h new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete_l.h --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete_l.h 1970-01-01 01:00:00.000000000 +0100 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderdelete_l.h 2015-11-22 23:38:15.000000000 +0100 @@ -0,0 +1,21 @@ +/*************************************************************************** + begin : Wed Jan 15 2014 + copyright : (C) 2014 by Martin Preuss + email : [email protected] + + *************************************************************************** + * Please see toplevel file COPYING for license details * + ***************************************************************************/ + + +#ifndef AH_JOBSEPASTANDINGORDERDELETE_L_H +#define AH_JOBSEPASTANDINGORDERDELETE_L_H + + +#include "accountjob_l.h" + + +AH_JOB *AH_Job_SepaStandingOrderDelete_new(AB_USER *u, AB_ACCOUNT *account); + + +#endif /* AH_JOBSEPASTANDINGORDERDELETE_L_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.c new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.c --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.c 2014-08-20 21:45:01.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/ajobs/jobsepastandingorderget.c 2015-12-20 17:39:53.000000000 +0100 @@ -118,12 +118,55 @@ /* --------------------------------------------------------------- FUNCTION */ -int AH_Job_SepaStandingOrdersGet_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ - AB_ACCOUNT *a; +int AH_Job_SepaStandingOrdersGet__ReadSto(AH_JOB *j, + AB_IMEXPORTER_CONTEXT *ctx, + const uint8_t *ptr, + uint32_t len, + const char *fiId){ + int rv; + AB_IMEXPORTER_CONTEXT *tmpCtx; + GWEN_BUFFER *tbuf; AB_IMEXPORTER_ACCOUNTINFO *ai; + + tmpCtx=AB_ImExporterContext_new(); + tbuf=GWEN_Buffer_new(0, 256, 0, 1); + GWEN_Buffer_AppendBytes(tbuf, (const char*) ptr, len); + + rv=AB_Banking_ImportBuffer(AH_Job_GetBankingApi(j), + tmpCtx, + "sepa", + "default", + tbuf); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + GWEN_Buffer_free(tbuf); + AB_ImExporterContext_free(tmpCtx); + return rv; + } + GWEN_Buffer_free(tbuf); + + ai=AB_ImExporterContext_GetFirstAccountInfo(tmpCtx); + if (ai) { + AB_TRANSACTION *t; + + while( (t=AB_ImExporterAccountInfo_GetFirstTransaction(ai)) ) { + AB_Transaction_List_Del(t); + AB_Transaction_SetFiId(t, fiId); + /* add to real im/exporter context */ + AB_ImExporterContext_AddTransaction(ctx, t); + } + } + AB_ImExporterContext_free(tmpCtx); + + return 0; +} + + + +/* --------------------------------------------------------------- FUNCTION */ +int AH_Job_SepaStandingOrdersGet_Process(AH_JOB *j, AB_IMEXPORTER_CONTEXT *ctx){ GWEN_DB_NODE *dbResponses; GWEN_DB_NODE *dbCurr; - GWEN_BUFFER *bufStandingOrders; const char *responseName; int rv; @@ -134,8 +177,6 @@ responseName=AH_Job_GetResponseName(j); - bufStandingOrders=GWEN_Buffer_new(0, 1024, 0, 1); - dbResponses=AH_Job_GetResponses(j); assert(dbResponses); @@ -145,14 +186,12 @@ rv=AH_Job_CheckEncryption(j, dbCurr); if (rv) { DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (encryption)"); - GWEN_Buffer_free(bufStandingOrders); AH_Job_SetStatus(j, AH_JobStatusError); return rv; } rv=AH_Job_CheckSignature(j, dbCurr); if (rv) { DBG_INFO(AQHBCI_LOGDOMAIN, "Compromised security (signature)"); - GWEN_Buffer_free(bufStandingOrders); AH_Job_SetStatus(j, AH_JobStatusError); return rv; } @@ -166,48 +205,23 @@ if (dbXA) { const void *p; unsigned int bs; + const char *fiId; + fiId=GWEN_DB_GetCharValue(dbXA, "fiId", 0, NULL); p=GWEN_DB_GetBinValue(dbXA, "transfer", 0, 0, 0, &bs); - if (p && bs) - GWEN_Buffer_AppendBytes(bufStandingOrders, p, bs); + if (p && bs) { + rv=AH_Job_SepaStandingOrdersGet__ReadSto(j, ctx, p, bs, fiId); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d)", rv); + DBG_WARN(AQHBCI_LOGDOMAIN, "Error reading standing order from data, ignoring (%d)", rv); + } + } } } dbCurr=GWEN_DB_GetNextGroup(dbCurr); } - GWEN_Buffer_Rewind(bufStandingOrders); - - /* now the buffers contain data to be parsed by ImExporters */ - a=AH_AccountJob_GetAccount(j); - assert(a); - ai=AB_ImExporterContext_GetAccountInfo(ctx, - AB_Account_GetBankCode(a), - AB_Account_GetAccountNumber(a)); - assert(ai); - AB_ImExporterAccountInfo_SetAccountId(ai, AB_Account_GetUniqueId(a)); - - /* read booked transactions */ - if (GWEN_Buffer_GetUsedBytes(bufStandingOrders)) { - if (getenv("AQHBCI_LOGBOOKED")) { - FILE *f; - - f=fopen("/tmp/standingOrders.pain", "w+"); - if (f) { - if (fwrite(GWEN_Buffer_GetStart(bufStandingOrders), - GWEN_Buffer_GetUsedBytes(bufStandingOrders), 1, f)!=1) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "fwrite: %s", strerror(errno)); - } - if (fclose(f)) { - DBG_ERROR(AQHBCI_LOGDOMAIN, "fclose: %s", strerror(errno)); - } - } - } - - /* TODO: parse data */ - } - - GWEN_Buffer_free(bufStandingOrders); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/hhd.c new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/applayer/hhd.c --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/hhd.c 2014-07-23 22:29:51.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/applayer/hhd.c 2015-12-20 20:45:17.000000000 +0100 @@ -98,7 +98,12 @@ int rv; unsigned int len; unsigned int i=0; + unsigned int LSandFlags; + unsigned int numCtrlBytes; + unsigned int moreCtrlBytes; + unsigned int numBytes; + /* read LC */ rv=AH_HHD14_ReadBytesHex(code, 2); if (rv<0) { DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d) at [%s]", rv, code); @@ -106,13 +111,42 @@ } len=((unsigned int) rv); code+=2; + if ((strlen(code)+2)<len*2) { DBG_ERROR(AQHBCI_LOGDOMAIN, "Too few bytes in buffer (%d<%d) at [%s]", (int)(strlen(code)+2), len*2, code); return GWEN_ERROR_INVALID; } - while(i<len-2) { + /* read LS */ + rv=AH_HHD14_ReadBytesHex(code, 2); + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d) at [%s]", rv, code); + return rv; + } + code+=2; + + /* add control bytes and start code */ + LSandFlags = (unsigned int) rv; + numCtrlBytes = 0; + moreCtrlBytes = LSandFlags & 0x80; + + while (moreCtrlBytes) { + rv=AH_HHD14_ReadBytesHex(code+numCtrlBytes*2, 2); /* LS */ + if (rv<0) { + DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d) at [%s]", rv, code); + return rv; + } + numCtrlBytes++; + moreCtrlBytes = (unsigned int) rv & 0x80; + } + numBytes = (LSandFlags & 0x3f) + numCtrlBytes; + GWEN_Buffer_AppendBytes(xbuf, code, numBytes*2); + code += numBytes*2; + i += numBytes + 2; /* add length of LC and LS */ + + /* read LDE1, DE1, LDE2, DE2, ... */ + while(i<len-1) { unsigned int v; rv=AH_HHD14_ReadBytesHex(code, 2); @@ -120,8 +154,13 @@ DBG_INFO(AQHBCI_LOGDOMAIN, "here (%d) at [%s]", rv, code); return rv; } - v=((unsigned int) rv) & 0xf; +/* v=((unsigned int) rv) & 0xf; */ + v=((unsigned int) rv) & 0x3f; /* as suggested by Martin Kuehn */ code+=2; + if (i+v+1 > len) { + DBG_INFO(AQHBCI_LOGDOMAIN, "try to read past the end of code (%d) at [%s]", v, code); + return GWEN_ERROR_INVALID; + } GWEN_Buffer_AppendBytes(xbuf, code, v*2); code+=v*2; i+=v+1; @@ -260,7 +299,8 @@ code+=2; outLen=(inLen+1)/2; - snprintf(numbuf, sizeof(numbuf)-1, "%02x", outLen); + outLenAndFlags=outLen | (inLenAndFlags & 0x80); + snprintf(numbuf, sizeof(numbuf)-1, "%02x", outLenAndFlags); numbuf[sizeof(numbuf)-1]=0; GWEN_Buffer_AppendString(xbuf, numbuf); @@ -312,7 +352,8 @@ for (i=0; i<inLen; i++) { if (code[i]<'0' || code[i]>'9'){ - /* contains something other than digits, use ascii encoding */ + /* contains something other than digits, use ascii encoding */ + DBG_ERROR(AQHBCI_LOGDOMAIN, "Switched to ASCII"); inLenAndFlags|=0x40; break; } @@ -324,7 +365,7 @@ /* ascii */ //outLen=(inLen+1)/2; outLen=inLen; - outLenAndFlags=outLen | 0x10; /* add encoding flag to length */ + outLenAndFlags=outLen | 0x40; /* add encoding flag to length (bit 6) */ snprintf(numbuf, sizeof(numbuf)-1, "%02x", outLenAndFlags); numbuf[sizeof(numbuf)-1]=0; GWEN_Buffer_AppendString(xbuf, numbuf); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/xml/fints300seg.xml new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/applayer/xml/fints300seg.xml --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/applayer/xml/fints300seg.xml 2014-07-23 22:29:51.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/applayer/xml/fints300seg.xml 2016-01-07 20:34:00.000000000 +0100 @@ -338,6 +338,7 @@ <VALUE path="head/code">%code</VALUE> <VALUE path="head/version">%version</VALUE> <VALUE path="head/seq">998</VALUE> + <!-- <VALUE path="secProfile/version">2</VALUE> --> <VALUE path="function">998</VALUE> <VALUE path="role">1</VALUE> <VALUE path="secstamp/stampcode">1</VALUE> @@ -1209,7 +1210,7 @@ <ELEM name="jobHash" type="bin" maxsize="256" minnum="0" /> <ELEM name="jobReference" type="ascii" maxsize="35" minnum="0" /> <ELEM name="challenge" type="ascii" minnum="0" /> - <ELEM name="challengeHHD" type="bin" maxsize="128" minnum="0" /> + <ELEM name="challengeHHD" type="bin" maxsize="10240" minnum="0" /> <GROUP delimiter=":" terminator="" minnum="0"> <ELEM name="expireDate" type="ascii" minnum="0" /> <ELEM name="expireTime" type="ascii" minnum="0" /> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/banking/provider.c new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/banking/provider.c --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/banking/provider.c 2015-05-25 18:22:08.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/banking/provider.c 2015-11-22 23:38:16.000000000 +0100 @@ -34,6 +34,7 @@ #include "jobsepacor1datedsinglecreate_l.h" #include "jobsepacor1datedmulticreate_l.h" +#include "jobsepastandingorderdelete_l.h" #include "jobsepastandingordercreate_l.h" #include "jobsepastandingorderget_l.h" @@ -566,6 +567,13 @@ return GWEN_ERROR_NOT_AVAILABLE; } break; + case AB_Job_TypeSepaDeleteStandingOrder: + mj=AH_Job_SepaStandingOrderDelete_new(mu, ma); + if (!mj) { + DBG_ERROR(AQHBCI_LOGDOMAIN, "Job not supported with this account"); + return GWEN_ERROR_NOT_AVAILABLE; + } + break; case AB_Job_TypeSepaGetStandingOrders: mj=AH_Job_SepaStandingOrderGet_new(mu, ma); @@ -575,7 +583,6 @@ } break; - default: DBG_ERROR(AQHBCI_LOGDOMAIN, "Job not supported by AqHBCI"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/msgcrypt_pintan.c new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/msglayer/msgcrypt_pintan.c --- old/aqbanking-5.6.1beta/src/plugins/backends/aqhbci/plugin/msglayer/msgcrypt_pintan.c 2014-07-23 22:29:51.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqhbci/plugin/msglayer/msgcrypt_pintan.c 2015-12-27 13:26:15.000000000 +0100 @@ -1,7 +1,4 @@ /*************************************************************************** - $RCSfile$ - ------------------- - cvs : $Id: msgcrypt.inc 1109 2007-01-10 14:30:14Z martin $ begin : Mon Mar 01 2004 copyright : (C) 2004 by Martin Preuss email : [email protected] @@ -86,13 +83,15 @@ GWEN_DB_SetCharValue(cfg, GWEN_DB_FLAGS_DEFAULT, "secProfile/code", "PIN"); + /* if (crypt) GWEN_DB_SetIntValue(cfg, GWEN_DB_FLAGS_DEFAULT, - "secProfile/version", 1); + "secProfile/version", 1); else - GWEN_DB_SetIntValue(cfg, GWEN_DB_FLAGS_DEFAULT, - "secProfile/version", - (hmsg->itanMethod==999)?1:2); + */ + GWEN_DB_SetIntValue(cfg, GWEN_DB_FLAGS_DEFAULT, + "secProfile/version", + (hmsg->itanMethod==999)?1:2); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/version.h new/aqbanking-5.6.4beta/src/plugins/backends/aqofxconnect/version.h --- old/aqbanking-5.6.1beta/src/plugins/backends/aqofxconnect/version.h 2015-06-01 18:31:39.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/backends/aqofxconnect/version.h 2016-01-07 20:45:08.000000000 +0100 @@ -16,11 +16,11 @@ #define AQOFXCONNECT_VERSION_MAJOR 5 #define AQOFXCONNECT_VERSION_MINOR 6 -#define AQOFXCONNECT_VERSION_PATCHLEVEL 1 +#define AQOFXCONNECT_VERSION_PATCHLEVEL 4 #define AQOFXCONNECT_VERSION_BUILD 0 #define AQOFXCONNECT_VERSION_TAG "beta" -#define AQOFXCONNECT_VERSION_FULL_STRING "5.6.1.0beta" -#define AQOFXCONNECT_VERSION_STRING "5.6.1" +#define AQOFXCONNECT_VERSION_FULL_STRING "5.6.4.0beta" +#define AQOFXCONNECT_VERSION_STRING "5.6.4" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa.c new/aqbanking-5.6.4beta/src/plugins/imexporters/sepa/sepa.c --- old/aqbanking-5.6.1beta/src/plugins/imexporters/sepa/sepa.c 2014-07-23 22:29:51.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/imexporters/sepa/sepa.c 2015-12-20 20:53:12.000000000 +0100 @@ -248,8 +248,8 @@ pmtinf->localName = name ? name : AB_ImExporterAccountInfo_GetOwner(ai); pmtinf->localIban = iban ? iban : AB_ImExporterAccountInfo_GetIban(ai); pmtinf->localBic = bic ? bic : AB_ImExporterAccountInfo_GetBic(ai); - pmtinf->date=ti; - pmtinf->transDate=transDate; + pmtinf->date=ti; /* transaction date (AB_Transaction_GetDate()) */ + pmtinf->transDate=transDate; /* transaction date short representation ((year<<16)+(month<<8)+(day)) */ if (doctype[0]==8) { pmtinf->sequenceType=sequenceType; pmtinf->creditorSchemeId=cdtrSchmeId; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/plugins/parsers/swift/swift.c new/aqbanking-5.6.4beta/src/plugins/parsers/swift/swift.c --- old/aqbanking-5.6.1beta/src/plugins/parsers/swift/swift.c 2015-05-17 09:37:03.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/plugins/parsers/swift/swift.c 2016-01-06 19:26:09.000000000 +0100 @@ -479,15 +479,20 @@ if (buffer[0]==':') { const char *s; - s=buffer+1; - while(*s && isdigit(*s)) - s++; - if (isalpha(*s)) - s++; - if (*s==':') { - DBG_DEBUG(AQBANKING_LOGDOMAIN, "End of tag reached"); + if (strncasecmp(buffer, ":NS:", 4)==0) { break; } + else { + s=buffer+1; + while(*s && isdigit(*s)) + s++; + if (isalpha(*s)) + s++; + if (*s==':') { + DBG_DEBUG(AQBANKING_LOGDOMAIN, "End of tag reached"); + break; + } + } } /* check whether the line starts with a ":" or "-" */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/tools/aqbanking-cli/separecurtransfer.c new/aqbanking-5.6.4beta/src/tools/aqbanking-cli/separecurtransfer.c --- old/aqbanking-5.6.1beta/src/tools/aqbanking-cli/separecurtransfer.c 2014-10-12 15:40:15.000000000 +0200 +++ new/aqbanking-5.6.4beta/src/tools/aqbanking-cli/separecurtransfer.c 2015-11-22 23:38:16.000000000 +0100 @@ -15,6 +15,7 @@ #include <aqbanking/account.h> #include <aqbanking/jobsepacreatesto.h> +#include <aqbanking/jobsepadeletesto.h> #include <gwenhywfar/text.h> @@ -48,6 +49,7 @@ int rvExec; const char *rIBAN; const char *lIBAN; + const char *s; const GWEN_ARGS args[]={ { GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */ @@ -215,6 +217,17 @@ "set execution period" }, { + GWEN_ARGS_FLAGS_HAS_ARGUMENT, + GWEN_ArgsType_Char, + "fiId", /* HKCDL */ + 0, + 1, + 0, + "fiId", + "set the fiId (standing orders)", + "set the fiId (standing orders) - Auftragsidentifikation fuer HKCDL" + }, + { GWEN_ARGS_FLAGS_HELP | GWEN_ARGS_FLAGS_LAST, /* flags */ GWEN_ArgsType_Int, /* type */ "help", /* name */ @@ -301,8 +314,13 @@ return 2; } - /* create job */ - j=AB_JobSepaCreateStandingOrder_new(a); + /* determine the type of job and create it */ + s=AB_Transaction_GetFiId(t); + if (s && *s) + j=AB_JobSepaDeleteStandingOrder_new(a); + else + j=AB_JobSepaCreateStandingOrder_new(a); + rv=AB_Job_CheckAvailability(j); if (rv<0) { DBG_ERROR(0, "Job not supported."); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/src/tools/aqbanking-cli/util.c new/aqbanking-5.6.4beta/src/tools/aqbanking-cli/util.c --- old/aqbanking-5.6.1beta/src/tools/aqbanking-cli/util.c 2014-11-01 18:30:41.000000000 +0100 +++ new/aqbanking-5.6.4beta/src/tools/aqbanking-cli/util.c 2015-11-22 23:38:16.000000000 +0100 @@ -533,8 +533,12 @@ return NULL; } AB_Transaction_SetExecutionDay(t, i); - } + /* SetFiId */ + s=GWEN_DB_GetCharValue(db, "fiId", 0, 0); + if (s && *s) + AB_Transaction_SetFiId(t, s); + } return t; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/aqbanking-5.6.1beta/version.h new/aqbanking-5.6.4beta/version.h --- old/aqbanking-5.6.1beta/version.h 2015-06-01 18:31:40.000000000 +0200 +++ new/aqbanking-5.6.4beta/version.h 2016-01-07 20:45:09.000000000 +0100 @@ -13,15 +13,15 @@ #define AQBANKING_VERSION_MAJOR 5 #define AQBANKING_VERSION_MINOR 6 -#define AQBANKING_VERSION_PATCHLEVEL 1 +#define AQBANKING_VERSION_PATCHLEVEL 4 #define AQBANKING_VERSION_BUILD 0 #define AQBANKING_VERSION_TAG "beta" -#define AQBANKING_VERSION_FULL_STRING "5.6.1.0beta" -#define AQBANKING_VERSION_STRING "5.6.1" +#define AQBANKING_VERSION_FULL_STRING "5.6.4.0beta" +#define AQBANKING_VERSION_STRING "5.6.4" #define AQBANKING_SO_CURRENT 40 -#define AQBANKING_SO_REVISION 1 +#define AQBANKING_SO_REVISION 4 #define AQBANKING_SO_AGE 5 #define AQBANKING_SO_EFFECTIVE 35
