Diff of the two buildlogs:

--
--- b1/build.log	2024-12-12 12:38:06.302290355 +0000
+++ b2/build.log	2024-12-12 12:41:31.648949493 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Thu Dec 12 00:35:50 -12 2024
-I: pbuilder-time-stamp: 1734006950
+I: Current time: Fri Dec 13 02:38:09 +14 2024
+I: pbuilder-time-stamp: 1734007089
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/unstable-reproducible-base.tgz]
 I: copying local configuration
@@ -33,52 +33,84 @@
 dpkg-source: info: applying 0006-fix-trivial-orthography.patch
 I: Not using root during the build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/2513034/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/3612864/tmp/hooks/D01_modify_environment starting
+debug: Running on codethink04-arm64.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Dec 12 12:38 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/3612864/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/3612864/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build/reproducible-path'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='arm64'
-  DEBIAN_FRONTEND='noninteractive'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="aarch64-unknown-linux-gnu")
+  BASH_VERSION='5.2.37(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=arm64
+  DEBIAN_FRONTEND=noninteractive
   DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=12 '
-  DISTRIBUTION='unstable'
-  HOME='/root'
-  HOST_ARCH='arm64'
+  DIRSTACK=()
+  DISTRIBUTION=unstable
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=aarch64
+  HOST_ARCH=arm64
   IFS=' 	
   '
-  INVOCATION_ID='b1ed5bd287f64846aaa04cca7809d1db'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='2513034'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=176772722ef1451cbc6ab581e225040a
+  LANG=C
+  LANGUAGE=nl_BE:nl
+  LC_ALL=C
+  MACHTYPE=aarch64-unknown-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=3612864
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.N1kkIh0H/pbuilderrc_Esb6 --distribution unstable --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.N1kkIh0H/b1 --logfile b1/build.log libreswan_4.14-1.1.dsc'
-  SUDO_GID='109'
-  SUDO_UID='104'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://192.168.101.4:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.N1kkIh0H/pbuilderrc_XTYs --distribution unstable --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/unstable-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.N1kkIh0H/b2 --logfile b2/build.log libreswan_4.14-1.1.dsc'
+  SUDO_GID=109
+  SUDO_UID=104
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://192.168.101.4:3128
 I: uname -a
-  Linux codethink02-arm64 6.1.0-28-cloud-arm64 #1 SMP Debian 6.1.119-1 (2024-11-22) aarch64 GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-28-cloud-arm64 #1 SMP Debian 6.1.119-1 (2024-11-22) aarch64 GNU/Linux
 I: ls -l /bin
   lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/2513034/tmp/hooks/D02_print_environment finished
+I: user script /srv/workspace/pbuilder/3612864/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -322,7 +354,7 @@
 Get: 162 http://deb.debian.org/debian unstable/main arm64 systemd-dev all 257-2 [69.4 kB]
 Get: 163 http://deb.debian.org/debian unstable/main arm64 xsltproc arm64 1.1.35-1.1+b1 [115 kB]
 Get: 164 http://deb.debian.org/debian unstable/main arm64 xmlto arm64 0.0.28-3.1 [26.9 kB]
-Fetched 59.1 MB in 1s (101 MB/s)
+Fetched 59.1 MB in 1s (77.8 MB/s)
 debconf: delaying package configuration, since apt-utils is not installed
 Selecting previously unselected package libapr1t64:arm64.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 20082 files and directories currently installed.)
@@ -1035,7 +1067,11 @@
 Building tag database...
  -> Finished parsing the build-deps
 I: Building the package
-I: Running cd /build/reproducible-path/libreswan-4.14/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../libreswan_4.14-1.1_source.changes
+I: user script /srv/workspace/pbuilder/3612864/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for unstable
+I: user script /srv/workspace/pbuilder/3612864/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/libreswan-4.14/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../libreswan_4.14-1.1_source.changes
 dpkg-buildpackage: info: source package libreswan
 dpkg-buildpackage: info: source version 4.14-1.1
 dpkg-buildpackage: info: source distribution unstable
@@ -1057,7 +1093,7 @@
 rm -f /build/reproducible-path/pool/kvm-keys.tar
 rm -f   out.*
 rm -rf testing/pluto/*/OUTPUT*
-rm -rf OBJ.* OBJ.linux.aarch64.codethink02-arm64
+rm -rf OBJ.* OBJ.linux.aarch64.i-capture-the-hostname
 rm -rf BACKUP
 rm -f tags TAGS cscope
 rm -f cscope.files
@@ -2616,10 +2652,10 @@
     < ../../OBJ.linux.arm64/lib/libipsecconf/lex.yy.c.tmp > ../../OBJ.linux.arm64/lib/libipsecconf/lex.yy.c.sedtmp
 rm ../../OBJ.linux.arm64/lib/libipsecconf/lex.yy.c.tmp
 : install result
-mv ../../OBJ.linux.arm64/lib/libipsecconf/lex.yy.c.sedtmp ../../OBJ.linux.arm64/lib/libipsecconf/lex.yy.c
 sed -e '/^ *#/s/if YYENABLE_NLS/if defined(YYENABLE_NLS) \&\& YYENABLE_NLS/' \
     -e '/^ *#/s/if YYLTYPE_IS_TRIVIAL/if defined(YYLTYPE_IS_TRIVIAL) \&\& YYLTYPE_IS_TRIVIAL/' \
     < ../../OBJ.linux.arm64/lib/libipsecconf/parser.tab.c.tmp >  ../../OBJ.linux.arm64/lib/libipsecconf/parser.tab.c.sedtmp
+mv ../../OBJ.linux.arm64/lib/libipsecconf/lex.yy.c.sedtmp ../../OBJ.linux.arm64/lib/libipsecconf/lex.yy.c
 rm ../../OBJ.linux.arm64/lib/libipsecconf/parser.tab.c.tmp
 mv ../../OBJ.linux.arm64/lib/libipsecconf/parser.tab.c.sedtmp ../../OBJ.linux.arm64/lib/libipsecconf/parser.tab.c
 cc -pthread -std=gnu99 -g -Werror -Wall -Wextra -Wformat -Wformat-nonliteral -Wformat-security -Wundef -Wmissing-declarations -Wredundant-decls -Wnested-externs -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fstack-protector-all -fno-strict-aliasing -fPIE -DPIE -DNSS_IPSEC_PROFILE -DUSE_IKEv1 -DKERNEL_XFRM -DUSE_XFRM_INTERFACE -DXFRM_LIFETIME_DEFAULT=30 -DUSE_DNSSEC -DDEFAULT_DNSSEC_ROOTKEY_FILE=\"/usr/share/dns/root.key\" -DHAVE_LABELED_IPSEC -DLIBCURL -DUSE_LINUX_AUDIT -DLIBLDAP -DHAVE_NM -DUSE_PAM_AUTH -DUSE_3DES -DUSE_AES -DUSE_CAMELLIA -DUSE_CHACHA -DUSE_DH31 -DUSE_MD5 -DUSE_SHA1 -DUSE_SHA2 -DUSE_PRF_AES_XCBC -DUSE_NSS_KDF -DDEFAULT_RUNDIR=\"/run/pluto\" -DIPSEC_CONF=\"/etc/ipsec.conf\" -DIPSEC_CONFDDIR=\"/etc/ipsec.d\" -DIPSEC_NSSDIR=\"/var/lib/ipsec/nss\" -DIPSEC_CONFDIR=\"/etc\" -DIPSEC_EXECDIR=\"/usr/libexec/ipsec\" -DIPSEC_SBINDIR=\"/usr/sbin\" -DIPSEC_VARDIR=\"/var\" -DPOLICYGROUPSDIR=\"/etc/ipsec.d/policies\" -DIPSEC_SECRETS_FILE=\"/etc/ipsec.secrets\" -DFORCE_PR_ASSERT -DHAVE_IPTABLES -DUSE_FORK=1 -DUSE_VFORK=0 -DUSE_DAEMON=0 -DUSE_PTHREAD_SETSCHEDPRIO=1 -DGCC_LINT -DHAVE_LIBCAP_NG \
@@ -3868,8 +3904,8 @@
 IN _plutorun.in -> ../../OBJ.linux.arm64/programs/_plutorun/_plutorun
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < _plutorun.in > ../../OBJ.linux.arm64/programs/_plutorun/_plutorun.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < _plutorun.8.xml > ../../OBJ.linux.arm64/programs/_plutorun/_plutorun.8.tmp.tmp
-mv ../../OBJ.linux.arm64/programs/_plutorun/_plutorun.tmp ../../OBJ.linux.arm64/programs/_plutorun/_plutorun
 mv ../../OBJ.linux.arm64/programs/_plutorun/_plutorun.8.tmp.tmp ../../OBJ.linux.arm64/programs/_plutorun/_plutorun.8.tmp
+mv ../../OBJ.linux.arm64/programs/_plutorun/_plutorun.tmp ../../OBJ.linux.arm64/programs/_plutorun/_plutorun
 : ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/_plutorun/_plutorun.8.tmp -o ../../OBJ.linux.arm64/programs/_plutorun || true
 Note: Writing ipsec__plutorun.8
@@ -3882,8 +3918,8 @@
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < _secretcensor.in > ../../OBJ.linux.arm64/programs/_secretcensor/_secretcensor.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < _secretcensor.8.xml > ../../OBJ.linux.arm64/programs/_secretcensor/_secretcensor.8.tmp.tmp
 mv ../../OBJ.linux.arm64/programs/_secretcensor/_secretcensor.8.tmp.tmp ../../OBJ.linux.arm64/programs/_secretcensor/_secretcensor.8.tmp
-: ignoring seemingly bogus xmlto exit status
 mv ../../OBJ.linux.arm64/programs/_secretcensor/_secretcensor.tmp ../../OBJ.linux.arm64/programs/_secretcensor/_secretcensor
+: ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/_secretcensor/_secretcensor.8.tmp -o ../../OBJ.linux.arm64/programs/_secretcensor || true
 Note: Writing ipsec__secretcensor.8
 test -z ""  -a -r ../../OBJ.linux.arm64/programs/_secretcensor/ipsec__secretcensor.8
@@ -3895,8 +3931,8 @@
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < _unbound-hook.in > ../../OBJ.linux.arm64/programs/_unbound-hook/_unbound-hook.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < _unbound-hook.8.xml > ../../OBJ.linux.arm64/programs/_unbound-hook/_unbound-hook.8.tmp.tmp
 mv ../../OBJ.linux.arm64/programs/_unbound-hook/_unbound-hook.8.tmp.tmp ../../OBJ.linux.arm64/programs/_unbound-hook/_unbound-hook.8.tmp
-: ignoring seemingly bogus xmlto exit status
 mv ../../OBJ.linux.arm64/programs/_unbound-hook/_unbound-hook.tmp ../../OBJ.linux.arm64/programs/_unbound-hook/_unbound-hook
+: ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/_unbound-hook/_unbound-hook.8.tmp -o ../../OBJ.linux.arm64/programs/_unbound-hook || true
 Note: Writing ipsec__unbound-hook.8
 test -z ""  -a -r ../../OBJ.linux.arm64/programs/_unbound-hook/ipsec__unbound-hook.8
@@ -3907,8 +3943,8 @@
 IN _updown.in -> ../../OBJ.linux.arm64/programs/_updown/_updown
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < _updown.in > ../../OBJ.linux.arm64/programs/_updown/_updown.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < _updown.8.xml > ../../OBJ.linux.arm64/programs/_updown/_updown.8.tmp.tmp
-mv ../../OBJ.linux.arm64/programs/_updown/_updown.8.tmp.tmp ../../OBJ.linux.arm64/programs/_updown/_updown.8.tmp
 mv ../../OBJ.linux.arm64/programs/_updown/_updown.tmp ../../OBJ.linux.arm64/programs/_updown/_updown
+mv ../../OBJ.linux.arm64/programs/_updown/_updown.8.tmp.tmp ../../OBJ.linux.arm64/programs/_updown/_updown.8.tmp
 : ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/_updown/_updown.8.tmp -o ../../OBJ.linux.arm64/programs/_updown || true
 Note: Writing ipsec__updown.8
@@ -3982,9 +4018,9 @@
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < auto.in > ../../OBJ.linux.arm64/programs/auto/auto.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < auto.8.xml > ../../OBJ.linux.arm64/programs/auto/auto.8.tmp.tmp
 mv ../../OBJ.linux.arm64/programs/auto/auto.8.tmp.tmp ../../OBJ.linux.arm64/programs/auto/auto.8.tmp
+mv ../../OBJ.linux.arm64/programs/auto/auto.tmp ../../OBJ.linux.arm64/programs/auto/auto
 : ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/auto/auto.8.tmp -o ../../OBJ.linux.arm64/programs/auto || true
-mv ../../OBJ.linux.arm64/programs/auto/auto.tmp ../../OBJ.linux.arm64/programs/auto/auto
 Note: Writing ipsec_auto.8
 test -z ""  -a -r ../../OBJ.linux.arm64/programs/auto/ipsec_auto.8
 touch ../../OBJ.linux.arm64/programs/auto/auto.8.man
@@ -3994,9 +4030,9 @@
 IN barf.in -> ../../OBJ.linux.arm64/programs/barf/barf
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < barf.in > ../../OBJ.linux.arm64/programs/barf/barf.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < barf.8.xml > ../../OBJ.linux.arm64/programs/barf/barf.8.tmp.tmp
-mv ../../OBJ.linux.arm64/programs/barf/barf.tmp ../../OBJ.linux.arm64/programs/barf/barf
 mv ../../OBJ.linux.arm64/programs/barf/barf.8.tmp.tmp ../../OBJ.linux.arm64/programs/barf/barf.8.tmp
 : ignoring seemingly bogus xmlto exit status
+mv ../../OBJ.linux.arm64/programs/barf/barf.tmp ../../OBJ.linux.arm64/programs/barf/barf
 xmlto man ../../OBJ.linux.arm64/programs/barf/barf.8.tmp -o ../../OBJ.linux.arm64/programs/barf || true
 Note: Writing ipsec_barf.8
 test -z ""  -a -r ../../OBJ.linux.arm64/programs/barf/ipsec_barf.8
@@ -4164,13 +4200,13 @@
 IN ipsec.in -> ../../OBJ.linux.arm64/programs/ipsec/ipsec
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < ipsec.in > ../../OBJ.linux.arm64/programs/ipsec/ipsec.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < ipsec_checknss.8.xml > ../../OBJ.linux.arm64/programs/ipsec/ipsec_checknss.8.tmp.tmp
+mv ../../OBJ.linux.arm64/programs/ipsec/ipsec_checknss.8.tmp.tmp ../../OBJ.linux.arm64/programs/ipsec/ipsec_checknss.8.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < ipsec_initnss.8.xml > ../../OBJ.linux.arm64/programs/ipsec/ipsec_initnss.8.tmp.tmp
-sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < ipsec_import.8.xml > ../../OBJ.linux.arm64/programs/ipsec/ipsec_import.8.tmp.tmp
+mv ../../OBJ.linux.arm64/programs/ipsec/ipsec.tmp ../../OBJ.linux.arm64/programs/ipsec/ipsec
 mv ../../OBJ.linux.arm64/programs/ipsec/ipsec_initnss.8.tmp.tmp ../../OBJ.linux.arm64/programs/ipsec/ipsec_initnss.8.tmp
-mv ../../OBJ.linux.arm64/programs/ipsec/ipsec_checknss.8.tmp.tmp ../../OBJ.linux.arm64/programs/ipsec/ipsec_checknss.8.tmp
+sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < ipsec_import.8.xml > ../../OBJ.linux.arm64/programs/ipsec/ipsec_import.8.tmp.tmp
 mv ../../OBJ.linux.arm64/programs/ipsec/ipsec_import.8.tmp.tmp ../../OBJ.linux.arm64/programs/ipsec/ipsec_import.8.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < ipsec.8.xml > ../../OBJ.linux.arm64/programs/ipsec/ipsec.8.tmp.tmp
-mv ../../OBJ.linux.arm64/programs/ipsec/ipsec.tmp ../../OBJ.linux.arm64/programs/ipsec/ipsec
 mv ../../OBJ.linux.arm64/programs/ipsec/ipsec.8.tmp.tmp ../../OBJ.linux.arm64/programs/ipsec/ipsec.8.tmp
 : ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/ipsec/ipsec_checknss.8.tmp -o ../../OBJ.linux.arm64/programs/ipsec || true
@@ -4180,18 +4216,18 @@
 xmlto man ../../OBJ.linux.arm64/programs/ipsec/ipsec_import.8.tmp -o ../../OBJ.linux.arm64/programs/ipsec || true
 : ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/ipsec/ipsec.8.tmp -o ../../OBJ.linux.arm64/programs/ipsec || true
+Note: Writing ipsec_checknss.8
 Note: Writing ipsec_initnss.8
 Note: Writing ipsec_import.8
+test -z ""  -a -r ../../OBJ.linux.arm64/programs/ipsec/ipsec_checknss.8
+touch ../../OBJ.linux.arm64/programs/ipsec/ipsec_checknss.8.man
 Note: Writing ipsec.8
-Note: Writing ipsec_checknss.8
-test -z ""  -a -r ../../OBJ.linux.arm64/programs/ipsec/ipsec_import.8
 test -z ""  -a -r ../../OBJ.linux.arm64/programs/ipsec/ipsec_initnss.8
-touch ../../OBJ.linux.arm64/programs/ipsec/ipsec_import.8.man
 touch ../../OBJ.linux.arm64/programs/ipsec/ipsec_initnss.8.man
+test -z ""  -a -r ../../OBJ.linux.arm64/programs/ipsec/ipsec_import.8
+touch ../../OBJ.linux.arm64/programs/ipsec/ipsec_import.8.man
 test -z ""  -a -r ../../OBJ.linux.arm64/programs/ipsec/ipsec.8
 touch ../../OBJ.linux.arm64/programs/ipsec/ipsec.8.man
-test -z ""  -a -r ../../OBJ.linux.arm64/programs/ipsec/ipsec_checknss.8
-touch ../../OBJ.linux.arm64/programs/ipsec/ipsec_checknss.8.man
 make[4]: Leaving directory '/build/reproducible-path/libreswan-4.14/programs/ipsec'
 make[4]: Entering directory '/build/reproducible-path/libreswan-4.14/programs/letsencrypt'
 mkdir -p ../../OBJ.linux.arm64/programs/letsencrypt
@@ -4212,9 +4248,9 @@
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < look.in > ../../OBJ.linux.arm64/programs/look.linux/look.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < look.8.xml > ../../OBJ.linux.arm64/programs/look.linux/look.8.tmp.tmp
 mv ../../OBJ.linux.arm64/programs/look.linux/look.8.tmp.tmp ../../OBJ.linux.arm64/programs/look.linux/look.8.tmp
+mv ../../OBJ.linux.arm64/programs/look.linux/look.tmp ../../OBJ.linux.arm64/programs/look.linux/look
 : ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/look.linux/look.8.tmp -o ../../OBJ.linux.arm64/programs/look.linux || true
-mv ../../OBJ.linux.arm64/programs/look.linux/look.tmp ../../OBJ.linux.arm64/programs/look.linux/look
 Note: Writing ipsec_look.8
 test -z ""  -a -r ../../OBJ.linux.arm64/programs/look.linux/ipsec_look.8
 touch ../../OBJ.linux.arm64/programs/look.linux/look.8.man
@@ -4225,9 +4261,9 @@
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < newhostkey.in > ../../OBJ.linux.arm64/programs/newhostkey/newhostkey.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < newhostkey.8.xml > ../../OBJ.linux.arm64/programs/newhostkey/newhostkey.8.tmp.tmp
 mv ../../OBJ.linux.arm64/programs/newhostkey/newhostkey.8.tmp.tmp ../../OBJ.linux.arm64/programs/newhostkey/newhostkey.8.tmp
-mv ../../OBJ.linux.arm64/programs/newhostkey/newhostkey.tmp ../../OBJ.linux.arm64/programs/newhostkey/newhostkey
 : ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/newhostkey/newhostkey.8.tmp -o ../../OBJ.linux.arm64/programs/newhostkey || true
+mv ../../OBJ.linux.arm64/programs/newhostkey/newhostkey.tmp ../../OBJ.linux.arm64/programs/newhostkey/newhostkey
 Note: Writing ipsec_newhostkey.8
 test -z ""  -a -r ../../OBJ.linux.arm64/programs/newhostkey/ipsec_newhostkey.8
 touch ../../OBJ.linux.arm64/programs/newhostkey/newhostkey.8.man
@@ -4306,9 +4342,9 @@
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < setup.in > ../../OBJ.linux.arm64/programs/setup/setup.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < setup.8.xml > ../../OBJ.linux.arm64/programs/setup/setup.8.tmp.tmp
 mv ../../OBJ.linux.arm64/programs/setup/setup.8.tmp.tmp ../../OBJ.linux.arm64/programs/setup/setup.8.tmp
+mv ../../OBJ.linux.arm64/programs/setup/setup.tmp ../../OBJ.linux.arm64/programs/setup/setup
 : ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/setup/setup.8.tmp -o ../../OBJ.linux.arm64/programs/setup || true
-mv ../../OBJ.linux.arm64/programs/setup/setup.tmp ../../OBJ.linux.arm64/programs/setup/setup
 Note: Writing ipsec_setup.8
 test -z ""  -a -r ../../OBJ.linux.arm64/programs/setup/ipsec_setup.8
 touch ../../OBJ.linux.arm64/programs/setup/setup.8.man
@@ -4412,8 +4448,8 @@
 IN _updown.xfrm.in -> ../../OBJ.linux.arm64/programs/_updown.xfrm/_updown.xfrm
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < _updown.xfrm.in > ../../OBJ.linux.arm64/programs/_updown.xfrm/_updown.xfrm.tmp
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < _updown.xfrm.8.xml > ../../OBJ.linux.arm64/programs/_updown.xfrm/_updown.xfrm.8.tmp.tmp
-mv ../../OBJ.linux.arm64/programs/_updown.xfrm/_updown.xfrm.8.tmp.tmp ../../OBJ.linux.arm64/programs/_updown.xfrm/_updown.xfrm.8.tmp
 mv ../../OBJ.linux.arm64/programs/_updown.xfrm/_updown.xfrm.tmp ../../OBJ.linux.arm64/programs/_updown.xfrm/_updown.xfrm
+mv ../../OBJ.linux.arm64/programs/_updown.xfrm/_updown.xfrm.8.tmp.tmp ../../OBJ.linux.arm64/programs/_updown.xfrm/_updown.xfrm.8.tmp
 : ignoring seemingly bogus xmlto exit status
 xmlto man ../../OBJ.linux.arm64/programs/_updown.xfrm/_updown.xfrm.8.tmp -o ../../OBJ.linux.arm64/programs/_updown.xfrm || true
 Note: Writing ipsec__updown.xfrm.8
@@ -4876,15 +4912,15 @@
 mv ../OBJ.linux.arm64/configs/ipsec.conf.tmp ../OBJ.linux.arm64/configs/ipsec.conf
 IN ipsec.secrets.in -> ../OBJ.linux.arm64/configs/ipsec.secrets
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < ipsec.secrets.in > ../OBJ.linux.arm64/configs/ipsec.secrets.tmp
-mv ../OBJ.linux.arm64/configs/ipsec.secrets.tmp ../OBJ.linux.arm64/configs/ipsec.secrets
 IN clear.in -> ../OBJ.linux.arm64/configs/clear
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < clear.in > ../OBJ.linux.arm64/configs/clear.tmp
+mv ../OBJ.linux.arm64/configs/ipsec.secrets.tmp ../OBJ.linux.arm64/configs/ipsec.secrets
+mv ../OBJ.linux.arm64/configs/clear.tmp ../OBJ.linux.arm64/configs/clear
 IN clear-or-private.in -> ../OBJ.linux.arm64/configs/clear-or-private
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < clear-or-private.in > ../OBJ.linux.arm64/configs/clear-or-private.tmp
-mv ../OBJ.linux.arm64/configs/clear.tmp ../OBJ.linux.arm64/configs/clear
-mv ../OBJ.linux.arm64/configs/clear-or-private.tmp ../OBJ.linux.arm64/configs/clear-or-private
 IN private-or-clear.in -> ../OBJ.linux.arm64/configs/private-or-clear
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < private-or-clear.in > ../OBJ.linux.arm64/configs/private-or-clear.tmp
+mv ../OBJ.linux.arm64/configs/clear-or-private.tmp ../OBJ.linux.arm64/configs/clear-or-private
 mv ../OBJ.linux.arm64/configs/private-or-clear.tmp ../OBJ.linux.arm64/configs/private-or-clear
 IN private.in -> ../OBJ.linux.arm64/configs/private
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < private.in > ../OBJ.linux.arm64/configs/private.tmp
@@ -4897,20 +4933,20 @@
 mv ../OBJ.linux.arm64/configs/portexcludes.conf.tmp ../OBJ.linux.arm64/configs/portexcludes.conf
 IN libreswan.in -> ../OBJ.linux.arm64/configs/libreswan
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < libreswan.in > ../OBJ.linux.arm64/configs/libreswan.tmp
+mv ../OBJ.linux.arm64/configs/libreswan.tmp ../OBJ.linux.arm64/configs/libreswan
 missing=$(find d.ipsec.conf -name '*.xml' | sort - d.ipsec.conf/order.txt | uniq -u) ; \
 if test "${missing}" != ""; then	\
 	echo "${missing}" ;		\
 	exit 1 ;			\
 fi
-cat d.ipsec.conf/order.txt | xargs cat | sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  > ../OBJ.linux.arm64/configs/ipsec.conf.5.tmp.tmp
-mv ../OBJ.linux.arm64/configs/libreswan.tmp ../OBJ.linux.arm64/configs/libreswan
 sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  < ipsec.secrets.5.xml > ../OBJ.linux.arm64/configs/ipsec.secrets.5.tmp.tmp
-mv ../OBJ.linux.arm64/configs/ipsec.conf.5.tmp.tmp ../OBJ.linux.arm64/configs/ipsec.conf.5.tmp
+cat d.ipsec.conf/order.txt | xargs cat | sed -e "/@linux_START@/,/@linux_END@/d" -e "s:@DOCKER_PLUTONOFORK@:--nofork:g" -e "s:@EXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALCONFDDIR@:/etc/ipsec.d:g" -e "s:@FINALCONFDIR@:/etc:g" -e "s:@FINALCONFFILE@:/etc/ipsec.conf:g" -e "s:@FINALDOCDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALEXAMPLECONFDIR@:/usr/share/doc/libreswan:g" -e "s:@FINALINITDDIR@:/etc/init.d:g" -e "s:@FINALINITSYSTEMDIR@:/etc/sysvinit:g" -e "s:@FINALINITSYSTEMEXAMPLESDIR@:/usr/share/examples/sysvinit:g" -e "s:@FINALLIBEXECDIR@:/usr/libexec/ipsec:g" -e "s:@FINALLOGDIR@:/var/log:g" -e "s:@FINALLOGROTATEDDIR@:/etc/logrotate.d:g" -e "s:@FINALSBINDIR@:/usr/sbin:g" -e "s:@FINALSYSCONFDIR@:/etc:g" -e "s:@FINALVARDIR@:/var:g" -e "s:@INITSYSTEM@:sysvinit:g" -e "s:@IPSECVERSION@:4.14:g" -e "s:@IPSEC_CONF@:/etc/ipsec.conf:g" -e "s:@IPSEC_CONFDDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_EXECDIR@:/usr/libexec/ipsec:g" -e "s:@IPSEC_NSSDIR@:/var/lib/ipsec/nss:g" -e "s:@IPSEC_PPKDIR@:/etc/ipsec.d:g" -e "s:@IPSEC_RUNDIR@:/run/pluto:g" -e "s:@IPSEC_SBINDIR@:/usr/sbin:g" -e "s:@IPSEC_SECRETS_FILE@:/etc/ipsec.secrets:g" -e "s:@IPSEC_VARDIR@:/var:g" -e "s:@MODPROBEARGS@:--quiet --use-blacklist:g" -e "s:@MODPROBEBIN@:modprobe:g" -e "s:@OSDEP@:linux:g" -e "s:@PYTHON_BINARY@:/usr/bin/python3:g" -e "s:@SD_PLUTO_OPTIONS@::g" -e "s:@SD_RESTART_TYPE@::g" -e "s:@SD_TYPE@:simple:g" -e "s:@SD_WATCHDOGSEC@:0:g" -e "s:@SHELL_BINARY@:/bin/sh:g" -e "s:@USE_DEFAULT_CONNS@::g" -e "s:@HAVE_IPTABLES@:true:g" -e "s:@HAVE_NFTABLES@:false:g"  > ../OBJ.linux.arm64/configs/ipsec.conf.5.tmp.tmp
 mv ../OBJ.linux.arm64/configs/ipsec.secrets.5.tmp.tmp ../OBJ.linux.arm64/configs/ipsec.secrets.5.tmp
 : ignoring seemingly bogus xmlto exit status
-xmlto man ../OBJ.linux.arm64/configs/ipsec.conf.5.tmp -o ../OBJ.linux.arm64/configs || true
-: ignoring seemingly bogus xmlto exit status
+mv ../OBJ.linux.arm64/configs/ipsec.conf.5.tmp.tmp ../OBJ.linux.arm64/configs/ipsec.conf.5.tmp
 xmlto man ../OBJ.linux.arm64/configs/ipsec.secrets.5.tmp -o ../OBJ.linux.arm64/configs || true
+: ignoring seemingly bogus xmlto exit status
+xmlto man ../OBJ.linux.arm64/configs/ipsec.conf.5.tmp -o ../OBJ.linux.arm64/configs || true
 Note: Writing ipsec.secrets.5
 test -z ""  -a -r ../OBJ.linux.arm64/configs/ipsec.secrets.5
 touch ../OBJ.linux.arm64/configs/ipsec.secrets.5.man
@@ -8203,16 +8239,16 @@
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe860
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: CAMELLIA_CBC
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe838
+|     params: 8-bytes@0xfffffe02af18
 | decode_to_chunk: IV: : input "0x00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00"
 | decode_to_chunk: output: 
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
@@ -8252,16 +8288,16 @@
 |   00 11 22 33  44 55 66 77  88 99 aa bb  cc dd ee ff   .."3DUfw........
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe860
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: CAMELLIA_CBC
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe838
+|     params: 8-bytes@0xfffffe02af18
 | decode_to_chunk: IV: : input "0x00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00"
 | decode_to_chunk: output: 
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
@@ -8302,16 +8338,16 @@
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe860
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af40
 |     key-offset: 0, key-size: 32
 | EXTRACT_KEY_FROM_KEY:
 |     target: CAMELLIA_CBC
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 32-bytes
-|     base: base-key@0xaaaaf0d11ae0 (48-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (48-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe838
+|     params: 8-bytes@0xfffffe02af18
 | decode_to_chunk: IV: : input "0x00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00"
 | decode_to_chunk: output: 
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
@@ -8352,16 +8388,16 @@
 |   ff ee dd cc  bb aa 99 88  77 66 55 44  33 22 11 00   ........wfUD3"..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe860
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af40
 |     key-offset: 0, key-size: 32
 | EXTRACT_KEY_FROM_KEY:
 |     target: CAMELLIA_CBC
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 32-bytes
-|     base: base-key@0xaaaaf0d11ae0 (48-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (48-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe838
+|     params: 8-bytes@0xfffffe02af18
 | decode_to_chunk: IV: : input "0x00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00"
 | decode_to_chunk: output: 
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
@@ -8402,16 +8438,16 @@
 |   cf 06 3a 34  d4 a9 a7 6c  2c 86 78 7d  3f 96 db 71   ..:4...l,.x}?..q
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7f0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aed0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_GCM
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe7c8
+|     params: 8-bytes@0xfffffe02aea8
 | decode_to_chunk: salted IV: input "0x113b9785971864c83b01c787"
 | decode_to_chunk: output: 
 |   11 3b 97 85  97 18 64 c8  3b 01 c7 87                .;....d.;...
@@ -8448,16 +8484,16 @@
 |   e9 8b 72 a9  88 1a 84 ca  6b 76 e0 f4  3e 68 64 7a   ..r.....kv..>hdz
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7f0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aed0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_GCM
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe7c8
+|     params: 8-bytes@0xfffffe02aea8
 | decode_to_chunk: salted IV: input "0x8b23299fde174053f3d652ba"
 | decode_to_chunk: output: 
 |   8b 23 29 9f  de 17 40 53  f3 d6 52 ba                .#)...@S..R.
@@ -8498,16 +8534,16 @@
 |   bf d4 14 a6  21 29 58 a6  07 a0 f5 d3  ab 48 47 1d   ....!)X......HG.
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7f0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aed0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_GCM
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe7c8
+|     params: 8-bytes@0xfffffe02aea8
 | decode_to_chunk: salted IV: input "0x86d8ea0ab8e40dcc481cd0e2"
 | decode_to_chunk: output: 
 |   86 d8 ea 0a  b8 e4 0d cc  48 1c d0 e2                ........H...
@@ -8554,16 +8590,16 @@
 |   00 6c 45 81  00 fc 5f 4d  62 94 9d 2c  83 3b 82 d1   .lE..._Mb..,.;..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7f0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aed0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_GCM
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe7c8
+|     params: 8-bytes@0xfffffe02aea8
 | decode_to_chunk: salted IV: input "0xa4e9c4bc5725a21ff42c82b2"
 | decode_to_chunk: output: 
 |   a4 e9 c4 bc  57 25 a2 1f  f4 2c 82 b2                ....W%...,..
@@ -8611,16 +8647,16 @@
 |   ae 68 52 f8  12 10 67 cc  4b f7 a5 76  55 77 f3 9e   .hR...g.K..vUw..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe850
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af30
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CTR
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe828
+|     params: 8-bytes@0xfffffe02af08
 | decode_to_chunk: input counter-block: : input "0x 00 00 00 30  00 00 00 00 00 00 00 00  00 00 00 01"
 | decode_to_chunk: output: 
 |   00 00 00 30  00 00 00 00  00 00 00 00  00 00 00 01   ...0............
@@ -8662,16 +8698,16 @@
 |   7e 24 06 78  17 fa e0 d7  43 d6 ce 1f  32 53 91 63   ~$.x....C...2S.c
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe850
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af30
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CTR
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe828
+|     params: 8-bytes@0xfffffe02af08
 | decode_to_chunk: input counter-block: : input "0x 00 6C B6 DB C0 54 3B 59 DA 48 D9 0B 00 00 00 01"
 | decode_to_chunk: output: 
 |   00 6c b6 db  c0 54 3b 59  da 48 d9 0b  00 00 00 01   .l...T;Y.H......
@@ -8717,16 +8753,16 @@
 |   76 91 be 03  5e 50 20 a8  ac 6e 61 85  29 f9 a0 dc   v...^P ..na.)...
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe850
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af30
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CTR
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe828
+|     params: 8-bytes@0xfffffe02af08
 | decode_to_chunk: input counter-block: : input "0x 00 E0 01 7B  27 77 7F 3F 4A 17 86 F0  00 00 00 01"
 | decode_to_chunk: output: 
 |   00 e0 01 7b  27 77 7f 3f  4a 17 86 f0  00 00 00 01   ...{'w.?J.......
@@ -8777,16 +8813,16 @@
 |   86 3d 06 cc  fd b7 85 15                             .=......
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe850
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af30
 |     key-offset: 0, key-size: 24
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CTR
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 24-bytes
-|     base: base-key@0xaaaaf0d11ae0 (40-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (40-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe828
+|     params: 8-bytes@0xfffffe02af08
 | decode_to_chunk: input counter-block: : input "0x 00 00 00 48  36 73 3C 14 7D 6D 93 CB  00 00 00 01"
 | decode_to_chunk: output: 
 |   00 00 00 48  36 73 3c 14  7d 6d 93 cb  00 00 00 01   ...H6s<.}m......
@@ -8829,16 +8865,16 @@
 |   67 8c 3d b8  e6 f6 a9 1a                             g.=.....
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe850
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af30
 |     key-offset: 0, key-size: 24
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CTR
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 24-bytes
-|     base: base-key@0xaaaaf0d11ae0 (40-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (40-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe828
+|     params: 8-bytes@0xfffffe02af08
 | decode_to_chunk: input counter-block: : input "0x 00 96 B0 3B  02 0C 6E AD C2 CB 50 0D  00 00 00 01"
 | decode_to_chunk: output: 
 |   00 96 b0 3b  02 0c 6e ad  c2 cb 50 0d  00 00 00 01   ...;..n...P.....
@@ -8885,16 +8921,16 @@
 |   f5 9b 60 a7  86 d3 e0 fe                             ..`.....
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe850
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af30
 |     key-offset: 0, key-size: 24
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CTR
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 24-bytes
-|     base: base-key@0xaaaaf0d11ae0 (40-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (40-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe828
+|     params: 8-bytes@0xfffffe02af08
 | decode_to_chunk: input counter-block: : input "0x 00 07 BD FD  5C BD 60 27 8D CC 09 12  00 00 00 01"
 | decode_to_chunk: output: 
 |   00 07 bd fd  5c bd 60 27  8d cc 09 12  00 00 00 01   ....\.`'........
@@ -8945,16 +8981,16 @@
 |   6a 81 af 1e  ec 96 b4 d3  7f c1 d6 89  e6 c1 c1 04   j...............
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe850
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af30
 |     key-offset: 0, key-size: 32
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CTR
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 32-bytes
-|     base: base-key@0xaaaaf0d11ae0 (48-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (48-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe828
+|     params: 8-bytes@0xfffffe02af08
 | decode_to_chunk: input counter-block: : input "0x 00 00 00 60  DB 56 72 C9 7A A8 F0 B2  00 00 00 01"
 | decode_to_chunk: output: 
 |   00 00 00 60  db 56 72 c9  7a a8 f0 b2  00 00 00 01   ...`.Vr.z.......
@@ -8997,16 +9033,16 @@
 |   c6 6d d5 1a  5b 6a 99 74  4b 50 59 0c  87 a2 38 84   .m..[j.tKPY...8.
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe850
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af30
 |     key-offset: 0, key-size: 32
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CTR
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 32-bytes
-|     base: base-key@0xaaaaf0d11ae0 (48-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (48-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe828
+|     params: 8-bytes@0xfffffe02af08
 | decode_to_chunk: input counter-block: : input "0x 00 FA AC 24  C1 58 5E F1 5A 43 D8 75  00 00 00 01"
 | decode_to_chunk: output: 
 |   00 fa ac 24  c1 58 5e f1  5a 43 d8 75  00 00 00 01   ...$.X^.ZC.u....
@@ -9053,16 +9089,16 @@
 |   aa 62 d9 f8  05 53 2e df  f1 ee d6 87  fb 54 15 3d   .b...S.......T.=
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe850
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af30
 |     key-offset: 0, key-size: 32
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CTR
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 32-bytes
-|     base: base-key@0xaaaaf0d11ae0 (48-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (48-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe828
+|     params: 8-bytes@0xfffffe02af08
 | decode_to_chunk: input counter-block: : input "0x 00 1C C5 B7  51 A5 1D 70 A1 C1 11 48  00 00 00 01"
 | decode_to_chunk: output: 
 |   00 1c c5 b7  51 a5 1d 70  a1 c1 11 48  00 00 00 01   ....Q..p...H....
@@ -9113,16 +9149,16 @@
 |   06 a9 21 40  36 b8 a1 5b  51 2e 03 d5  34 12 00 06   ..!@6..[Q...4...
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe860
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CBC
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe838
+|     params: 8-bytes@0xfffffe02af18
 | decode_to_chunk: IV: : input "0x3dafba429d9eb430b422da802c9fac41"
 | decode_to_chunk: output: 
 |   3d af ba 42  9d 9e b4 30  b4 22 da 80  2c 9f ac 41   =..B...0."..,..A
@@ -9162,16 +9198,16 @@
 |   c2 86 69 6d  88 7c 9a a0  61 1b bb 3e  20 25 a4 5a   ..im.|..a..> %.Z
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe860
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CBC
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe838
+|     params: 8-bytes@0xfffffe02af18
 | decode_to_chunk: IV: : input "0x562e17996d093d28ddb3ba695a2e6f58"
 | decode_to_chunk: output: 
 |   56 2e 17 99  6d 09 3d 28  dd b3 ba 69  5a 2e 6f 58   V...m.=(...iZ.oX
@@ -9217,16 +9253,16 @@
 |   6c 3e a0 47  76 30 ce 21  a2 ce 33 4a  a7 46 c2 cd   l>.Gv0.!..3J.F..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe860
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CBC
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe838
+|     params: 8-bytes@0xfffffe02af18
 | decode_to_chunk: IV: : input "0xc782dc4c098c66cbd9cd27d825682c81"
 | decode_to_chunk: output: 
 |   c7 82 dc 4c  09 8c 66 cb  d9 cd 27 d8  25 68 2c 81   ...L..f...'.%h,.
@@ -9278,16 +9314,16 @@
 |   56 e4 7a 38  c5 59 89 74  bc 46 90 3d  ba 29 03 49   V.z8.Y.t.F.=.).I
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe860
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02af40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_CBC
 |     flags: ENCRYPT+DECRYPT
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe838
+|     params: 8-bytes@0xfffffe02af18
 | decode_to_chunk: IV: : input "0x8ce82eefbea0da3c44699ed7db51b7d9"
 | decode_to_chunk: output: 
 |   8c e8 2e ef  be a0 da 3c  44 69 9e d7  db 51 b7 d9   .......<Di...Q..
@@ -9350,38 +9386,38 @@
 | decode_to_chunk: test_prf_vector: input "0x75f0251d528ac01c4573dfd584d79f29"
 | decode_to_chunk: output: 
 |   75 f0 25 1d  52 8a c0 1c  45 73 df d5  84 d7 9f 29   u.%.R...Es.....)
-| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaaf0d13150 (length 16)
+| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaad58a2150 (length 16)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe780
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae60
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
+|     params: 8-bytes@0xfffffe02ade8
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6c8
-| PRF chunk interface PRF AES_XCBC 0xaaaaf0d11e80
-| PRF chunk interface PRF AES_XCBC update message (0xaaaaf0d12780 length 0)
+|     params: 8-bytes@0xfffffe02ada8
+| PRF chunk interface PRF AES_XCBC 0xaaaad58a0e80
+| PRF chunk interface PRF AES_XCBC update message (0xaaaad58a1780 length 0)
 |                                                        
 | XCBC: data
 |                                                        
-| K extracting all 16 bytes of key@0xaaaaf0d11ae0
-| K: symkey-key@0xaaaaf0d11ae0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a0ae0
+| K: symkey-key@0xaaaad58a0ae0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)623191333: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: (SECItemType)623191333: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -9390,16 +9426,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe660
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d15620 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe638
+|     params: 8-bytes@0xfffffe02ad18
 | Computing E[0] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -9420,37 +9456,37 @@
 | verify_chunk_data: RFC 3566 Test Case 1: AES-XCBC-MAC-96 with 0-byte input: ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaaf0d11ae0 (size 16)
-| PRF symkey interface: key symkey-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaad58a0ae0 (size 16)
+| PRF symkey interface: key symkey-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
-| PRF symkey interface PRF AES_XCBC 0xaaaaf0d11960
+|     params: 8-bytes@0xfffffe02ade8
+| PRF symkey interface PRF AES_XCBC 0xaaaad58a0960
 | PRF symkey interface PRF AES_XCBC update symkey message-key@(nil) (size 0)
 | PRF symkey interface: symkey message-key@NULL
 | symkey message NULL key has no bytes
 | XCBC: data
 |                                                        
-| K extracting all 16 bytes of key@0xaaaaf0d10070
-| K: symkey-key@0xaaaaf0d10070 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad589f070
+| K: symkey-key@0xaaaad589f070 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)-284170272: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d11e80
+| wrapper: (SECItemType)-33378624: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a0e80
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -9459,16 +9495,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6c0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ada0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
+|     params: 8-bytes@0xfffffe02ad78
 | Computing E[0] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -9484,23 +9520,23 @@
 |   75 f0 25 1d  52 8a c0 1c  45 73 df d5  84 d7 9f 29   u.%.R...Es.....)
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe728
-| PRF symkey interface PRF AES_XCBC final-key@0xaaaaf0d15620 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 3566 Test Case 1: AES-XCBC-MAC-96 with 0-byte input extracting all 16 bytes of key@0xaaaaf0d15620
-| RFC 3566 Test Case 1: AES-XCBC-MAC-96 with 0-byte input: symkey-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae08
+| PRF symkey interface PRF AES_XCBC final-key@0xaaaad58a4620 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 3566 Test Case 1: AES-XCBC-MAC-96 with 0-byte input extracting all 16 bytes of key@0xaaaad58a4620
+| RFC 3566 Test Case 1: AES-XCBC-MAC-96 with 0-byte input: symkey-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: a3 25 b6 2d  63 87 f8 af  dc cd bd e4  c6 94 52 7c
-| RFC 3566 Test Case 1: AES-XCBC-MAC-96 with 0-byte input extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: siBuffer: b3 8e 0e 51  b1 f7 8c 8b  4b 3e b7 f0  a1 28 f6 fa
+| RFC 3566 Test Case 1: AES-XCBC-MAC-96 with 0-byte input extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   75 f0 25 1d  52 8a c0 1c  45 73 df d5  84 d7 9f 29   u.%.R...Es.....)
 | verify_chunk_data: RFC 3566 Test Case 1: AES-XCBC-MAC-96 with 0-byte input: ok
@@ -9515,38 +9551,38 @@
 | decode_to_chunk: test_prf_vector: input "0x5b376580ae2f19afe7219ceef172756f"
 | decode_to_chunk: output: 
 |   5b 37 65 80  ae 2f 19 af  e7 21 9c ee  f1 72 75 6f   [7e../...!...ruo
-| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaaf0d11cd0 (length 16)
+| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaad58a0cd0 (length 16)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe780
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae60
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
+|     params: 8-bytes@0xfffffe02ade8
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6c8
-| PRF chunk interface PRF AES_XCBC 0xaaaaf0d11e80
-| PRF chunk interface PRF AES_XCBC update message (0xaaaaf0d10050 length 3)
+|     params: 8-bytes@0xfffffe02ada8
+| PRF chunk interface PRF AES_XCBC 0xaaaad58a0e80
+| PRF chunk interface PRF AES_XCBC update message (0xaaaad589f050 length 3)
 |   00 01 02                                             ...
 | XCBC: data
 |   00 01 02                                             ...
-| K extracting all 16 bytes of key@0xaaaaf0d11ae0
-| K: symkey-key@0xaaaaf0d11ae0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a0ae0
+| K: symkey-key@0xaaaad58a0ae0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)623191333: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: (SECItemType)623191333: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -9555,16 +9591,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe660
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe638
+|     params: 8-bytes@0xfffffe02ad18
 | Computing E[1] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -9585,54 +9621,54 @@
 | verify_chunk_data: RFC 3566 Test Case 2: AES-XCBC-MAC-96 with 3-byte input: ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d15620 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaaf0d11ae0 (size 16)
-| PRF symkey interface: key symkey-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaad58a0ae0 (size 16)
+| PRF symkey interface: key symkey-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
-| PRF symkey interface PRF AES_XCBC 0xaaaaf0d11960
+|     params: 8-bytes@0xfffffe02ade8
+| PRF symkey interface PRF AES_XCBC 0xaaaad58a0960
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 3
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 3-bytes
-|     base: base-key@0xaaaaf0d16ee0 (19-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (19-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaaf0d10070 (size 3)
-| PRF symkey interface: symkey message-key@0xaaaaf0d10070 (3-bytes, EXTRACT_KEY_FROM_KEY)
-| symkey message extracting all 3 bytes of key@0xaaaaf0d10070
-| symkey message: symkey-key@0xaaaaf0d10070 (3-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaad589f070 (size 3)
+| PRF symkey interface: symkey message-key@0xaaaad589f070 (3-bytes, EXTRACT_KEY_FROM_KEY)
+| symkey message extracting all 3 bytes of key@0xaaaad589f070
+| symkey message: symkey-key@0xaaaad589f070 (3-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: 10 05 f2 7e  62 d5 57 43  dd fa 7d 2d  a9 a1 a7 6b
-| symkey message extracted len 16 bytes at 0xaaaaf0d13a50
+| wrapper: siBuffer: 2f 8a 62 04  ee de 25 a9  74 f4 95 cc  6c f3 6c 98
+| symkey message extracted len 16 bytes at 0xaaaad58a2a50
 | unwrapped:
 |   00 01 02 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | XCBC: data
 |   00 01 02                                             ...
-| K extracting all 16 bytes of key@0xaaaaf0d15620
-| K: symkey-key@0xaaaaf0d15620 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a4620
+| K: symkey-key@0xaaaad58a4620 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)2097152: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d13b20
+| wrapper: (SECItemType)2097152: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a2b20
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -9641,16 +9677,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6c0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ada0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
+|     params: 8-bytes@0xfffffe02ad78
 | Computing E[1] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -9666,23 +9702,23 @@
 |   5b 37 65 80  ae 2f 19 af  e7 21 9c ee  f1 72 75 6f   [7e../...!...ruo
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe728
-| PRF symkey interface PRF AES_XCBC final-key@0xaaaaf0d16ee0 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 3566 Test Case 2: AES-XCBC-MAC-96 with 3-byte input extracting all 16 bytes of key@0xaaaaf0d16ee0
-| RFC 3566 Test Case 2: AES-XCBC-MAC-96 with 3-byte input: symkey-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae08
+| PRF symkey interface PRF AES_XCBC final-key@0xaaaad58a5ee0 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 3566 Test Case 2: AES-XCBC-MAC-96 with 3-byte input extracting all 16 bytes of key@0xaaaad58a5ee0
+| RFC 3566 Test Case 2: AES-XCBC-MAC-96 with 3-byte input: symkey-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: ba 5a 23 49  4b a9 c5 3a  f5 5e 7a 24  52 08 1f c3
-| RFC 3566 Test Case 2: AES-XCBC-MAC-96 with 3-byte input extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: siBuffer: 5b 75 28 bc  bd 38 f9 a3  3d 4e f2 d0  34 62 45 24
+| RFC 3566 Test Case 2: AES-XCBC-MAC-96 with 3-byte input extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   5b 37 65 80  ae 2f 19 af  e7 21 9c ee  f1 72 75 6f   [7e../...!...ruo
 | verify_chunk_data: RFC 3566 Test Case 2: AES-XCBC-MAC-96 with 3-byte input: ok
@@ -9697,38 +9733,38 @@
 | decode_to_chunk: test_prf_vector: input "0xd2a246fa349b68a79998a4394ff7a263"
 | decode_to_chunk: output: 
 |   d2 a2 46 fa  34 9b 68 a7  99 98 a4 39  4f f7 a2 63   ..F.4.h....9O..c
-| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaaf0d13150 (length 16)
+| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaad58a2150 (length 16)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe780
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae60
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
+|     params: 8-bytes@0xfffffe02ade8
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6c8
-| PRF chunk interface PRF AES_XCBC 0xaaaaf0d11e80
-| PRF chunk interface PRF AES_XCBC update message (0xaaaaf0d11a40 length 16)
+|     params: 8-bytes@0xfffffe02ada8
+| PRF chunk interface PRF AES_XCBC 0xaaaad58a0e80
+| PRF chunk interface PRF AES_XCBC update message (0xaaaad58a0a40 length 16)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
-| K extracting all 16 bytes of key@0xaaaaf0d11ae0
-| K: symkey-key@0xaaaaf0d11ae0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a0ae0
+| K: symkey-key@0xaaaad58a0ae0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)623191333: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: (SECItemType)623191333: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -9737,16 +9773,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe660
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe638
+|     params: 8-bytes@0xfffffe02ad18
 | XCBC: Computing E[1] using K2
 | XCBC: K2
 |   bd 86 2f fb  97 ad 2f b8  f8 b8 91 f6  03 2f 36 cb   ../.../....../6.
@@ -9765,54 +9801,54 @@
 | verify_chunk_data: RFC 3566 Test Case 3: AES-XCBC-MAC-96 with 16-byte input: ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaaf0d11ae0 (size 16)
-| PRF symkey interface: key symkey-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaad58a0ae0 (size 16)
+| PRF symkey interface: key symkey-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
-| PRF symkey interface PRF AES_XCBC 0xaaaaf0d11960
+|     params: 8-bytes@0xfffffe02ade8
+| PRF symkey interface PRF AES_XCBC 0xaaaad58a0960
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d15620 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaaf0d10070 (size 16)
-| PRF symkey interface: symkey message-key@0xaaaaf0d10070 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| symkey message extracting all 16 bytes of key@0xaaaaf0d10070
-| symkey message: symkey-key@0xaaaaf0d10070 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaad589f070 (size 16)
+| PRF symkey interface: symkey message-key@0xaaaad589f070 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| symkey message extracting all 16 bytes of key@0xaaaad589f070
+| symkey message: symkey-key@0xaaaad589f070 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| symkey message extracted len 16 bytes at 0xaaaaf0d11e80
+| wrapper: siBuffer: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| symkey message extracted len 16 bytes at 0xaaaad58a0e80
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
-| K extracting all 16 bytes of key@0xaaaaf0d16ee0
-| K: symkey-key@0xaaaaf0d16ee0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a5ee0
+| K: symkey-key@0xaaaad58a5ee0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)2097152: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d13b20
+| wrapper: (SECItemType)2097152: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a2b20
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -9821,16 +9857,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6c0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ada0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
+|     params: 8-bytes@0xfffffe02ad78
 | XCBC: Computing E[1] using K2
 | XCBC: K2
 |   bd 86 2f fb  97 ad 2f b8  f8 b8 91 f6  03 2f 36 cb   ../.../....../6.
@@ -9844,23 +9880,23 @@
 |   d2 a2 46 fa  34 9b 68 a7  99 98 a4 39  4f f7 a2 63   ..F.4.h....9O..c
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe728
-| PRF symkey interface PRF AES_XCBC final-key@0xaaaaf0d15620 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 3566 Test Case 3: AES-XCBC-MAC-96 with 16-byte input extracting all 16 bytes of key@0xaaaaf0d15620
-| RFC 3566 Test Case 3: AES-XCBC-MAC-96 with 16-byte input: symkey-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae08
+| PRF symkey interface PRF AES_XCBC final-key@0xaaaad58a4620 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 3566 Test Case 3: AES-XCBC-MAC-96 with 16-byte input extracting all 16 bytes of key@0xaaaad58a4620
+| RFC 3566 Test Case 3: AES-XCBC-MAC-96 with 16-byte input: symkey-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: a2 e1 28 09  05 2e 50 74  d0 72 e1 31  ac d8 f7 5d
-| RFC 3566 Test Case 3: AES-XCBC-MAC-96 with 16-byte input extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: siBuffer: ae 48 a9 df  e3 85 d8 06  7e de 49 a2  2b 4b f1 66
+| RFC 3566 Test Case 3: AES-XCBC-MAC-96 with 16-byte input extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   d2 a2 46 fa  34 9b 68 a7  99 98 a4 39  4f f7 a2 63   ..F.4.h....9O..c
 | verify_chunk_data: RFC 3566 Test Case 3: AES-XCBC-MAC-96 with 16-byte input: ok
@@ -9876,40 +9912,40 @@
 | decode_to_chunk: test_prf_vector: input "0x47f51b4564966215b8985c63055ed308"
 | decode_to_chunk: output: 
 |   47 f5 1b 45  64 96 62 15  b8 98 5c 63  05 5e d3 08   G..Ed.b...\c.^..
-| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaaf0d12780 (length 16)
+| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaad58a1780 (length 16)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe780
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae60
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
+|     params: 8-bytes@0xfffffe02ade8
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6c8
-| PRF chunk interface PRF AES_XCBC 0xaaaaf0d11e80
-| PRF chunk interface PRF AES_XCBC update message (0xaaaaf0d13d10 length 20)
+|     params: 8-bytes@0xfffffe02ada8
+| PRF chunk interface PRF AES_XCBC 0xaaaad58a0e80
+| PRF chunk interface PRF AES_XCBC update message (0xaaaad58a2d10 length 20)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
-| K extracting all 16 bytes of key@0xaaaaf0d11ae0
-| K: symkey-key@0xaaaaf0d11ae0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a0ae0
+| K: symkey-key@0xaaaad58a0ae0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)623191333: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: (SECItemType)623191333: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -9918,16 +9954,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe660
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe638
+|     params: 8-bytes@0xfffffe02ad18
 | Computing E[2] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -9948,56 +9984,56 @@
 | verify_chunk_data: RFC 3566 Test Case 4: AES-XCBC-MAC-96 with 20-byte input: ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d15620 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaaf0d11ae0 (size 16)
-| PRF symkey interface: key symkey-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaad58a0ae0 (size 16)
+| PRF symkey interface: key symkey-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
-| PRF symkey interface PRF AES_XCBC 0xaaaaf0d11960
+|     params: 8-bytes@0xfffffe02ade8
+| PRF symkey interface PRF AES_XCBC 0xaaaad58a0960
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 20
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 20-bytes
-|     base: base-key@0xaaaaf0d16ee0 (36-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (36-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaaf0d10070 (size 20)
-| PRF symkey interface: symkey message-key@0xaaaaf0d10070 (20-bytes, EXTRACT_KEY_FROM_KEY)
-| symkey message extracting all 20 bytes of key@0xaaaaf0d10070
-| symkey message: symkey-key@0xaaaaf0d10070 (20-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaad589f070 (size 20)
+| PRF symkey interface: symkey message-key@0xaaaad589f070 (20-bytes, EXTRACT_KEY_FROM_KEY)
+| symkey message extracting all 20 bytes of key@0xaaaad589f070
+| symkey message: symkey-key@0xaaaad589f070 (20-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 32
-| wrapper: siBuffer: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c  ca 3c 45 41  95 65 d1 1d  61 3c 9f 77  ac f2 52 24
-| symkey message extracted len 32 bytes at 0xaaaaf0d13b20
+| wrapper: siBuffer: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d  0b 48 53 19  27 85 e0 08  0f dc c0 d5  7d a1 8c 76
+| symkey message extracted len 32 bytes at 0xaaaad58a2b20
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
-| K extracting all 16 bytes of key@0xaaaaf0d15620
-| K: symkey-key@0xaaaaf0d15620 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a4620
+| K: symkey-key@0xaaaad58a4620 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)2097152: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d13b20
+| wrapper: (SECItemType)2097152: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a2b20
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -10006,16 +10042,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6c0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ada0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
+|     params: 8-bytes@0xfffffe02ad78
 | Computing E[2] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -10031,23 +10067,23 @@
 |   47 f5 1b 45  64 96 62 15  b8 98 5c 63  05 5e d3 08   G..Ed.b...\c.^..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe728
-| PRF symkey interface PRF AES_XCBC final-key@0xaaaaf0d16ee0 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 3566 Test Case 4: AES-XCBC-MAC-96 with 20-byte input extracting all 16 bytes of key@0xaaaaf0d16ee0
-| RFC 3566 Test Case 4: AES-XCBC-MAC-96 with 20-byte input: symkey-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae08
+| PRF symkey interface PRF AES_XCBC final-key@0xaaaad58a5ee0 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 3566 Test Case 4: AES-XCBC-MAC-96 with 20-byte input extracting all 16 bytes of key@0xaaaad58a5ee0
+| RFC 3566 Test Case 4: AES-XCBC-MAC-96 with 20-byte input: symkey-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: a7 97 8c 63  e1 38 06 a4  b8 9c 24 63  b8 37 9b b2
-| RFC 3566 Test Case 4: AES-XCBC-MAC-96 with 20-byte input extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: siBuffer: db 65 cd 11  fe da 6e d9  e3 46 38 df  1a 7c 97 2a
+| RFC 3566 Test Case 4: AES-XCBC-MAC-96 with 20-byte input extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   47 f5 1b 45  64 96 62 15  b8 98 5c 63  05 5e d3 08   G..Ed.b...\c.^..
 | verify_chunk_data: RFC 3566 Test Case 4: AES-XCBC-MAC-96 with 20-byte input: ok
@@ -10063,40 +10099,40 @@
 | decode_to_chunk: test_prf_vector: input "0xf54f0ec8d2b9f3d36807734bd5283fd4"
 | decode_to_chunk: output: 
 |   f5 4f 0e c8  d2 b9 f3 d3  68 07 73 4b  d5 28 3f d4   .O......h.sK.(?.
-| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaaf0d11cd0 (length 16)
+| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaad58a0cd0 (length 16)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe780
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae60
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
+|     params: 8-bytes@0xfffffe02ade8
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6c8
-| PRF chunk interface PRF AES_XCBC 0xaaaaf0d13970
-| PRF chunk interface PRF AES_XCBC update message (0xaaaaf0d11960 length 32)
+|     params: 8-bytes@0xfffffe02ada8
+| PRF chunk interface PRF AES_XCBC 0xaaaad58a2970
+| PRF chunk interface PRF AES_XCBC update message (0xaaaad58a0960 length 32)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  14 15 16 17  18 19 1a 1b  1c 1d 1e 1f   ................
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  14 15 16 17  18 19 1a 1b  1c 1d 1e 1f   ................
-| K extracting all 16 bytes of key@0xaaaaf0d11ae0
-| K: symkey-key@0xaaaaf0d11ae0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a0ae0
+| K: symkey-key@0xaaaad58a0ae0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)623191333: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d13a50
+| wrapper: (SECItemType)623191333: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a2a50
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -10105,16 +10141,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe660
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe638
+|     params: 8-bytes@0xfffffe02ad18
 | XCBC: Computing E[2] using K2
 | XCBC: K2
 |   bd 86 2f fb  97 ad 2f b8  f8 b8 91 f6  03 2f 36 cb   ../.../....../6.
@@ -10133,56 +10169,56 @@
 | verify_chunk_data: RFC 3566 Test Case 5: AES-XCBC-MAC-96 with 32-byte input: ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaaf0d11ae0 (size 16)
-| PRF symkey interface: key symkey-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaad58a0ae0 (size 16)
+| PRF symkey interface: key symkey-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
-| PRF symkey interface PRF AES_XCBC 0xaaaaf0d158d0
+|     params: 8-bytes@0xfffffe02ade8
+| PRF symkey interface PRF AES_XCBC 0xaaaad58a48d0
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 32
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 32-bytes
-|     base: base-key@0xaaaaf0d15620 (48-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (48-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaaf0d10070 (size 32)
-| PRF symkey interface: symkey message-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
-| symkey message extracting all 32 bytes of key@0xaaaaf0d10070
-| symkey message: symkey-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaad589f070 (size 32)
+| PRF symkey interface: symkey message-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+| symkey message extracting all 32 bytes of key@0xaaaad589f070
+| symkey message: symkey-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 32
-| wrapper: siBuffer: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c  72 b6 75 ac  1c fd 43 48  fe 2a 4d 5a  67 b2 63 30
-| symkey message extracted len 32 bytes at 0xaaaaf0d13b20
+| wrapper: siBuffer: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d  cf 81 9c 62  e6 5f eb 38  e8 e7 b5 3d  41 44 9e 5c
+| symkey message extracted len 32 bytes at 0xaaaad58a2b20
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  14 15 16 17  18 19 1a 1b  1c 1d 1e 1f   ................
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  14 15 16 17  18 19 1a 1b  1c 1d 1e 1f   ................
-| K extracting all 16 bytes of key@0xaaaaf0d16ee0
-| K: symkey-key@0xaaaaf0d16ee0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a5ee0
+| K: symkey-key@0xaaaad58a5ee0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)2097152: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d13150
+| wrapper: (SECItemType)2097152: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a2150
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -10191,16 +10227,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6c0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ada0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
+|     params: 8-bytes@0xfffffe02ad78
 | XCBC: Computing E[2] using K2
 | XCBC: K2
 |   bd 86 2f fb  97 ad 2f b8  f8 b8 91 f6  03 2f 36 cb   ../.../....../6.
@@ -10214,23 +10250,23 @@
 |   f5 4f 0e c8  d2 b9 f3 d3  68 07 73 4b  d5 28 3f d4   .O......h.sK.(?.
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe728
-| PRF symkey interface PRF AES_XCBC final-key@0xaaaaf0d15620 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 3566 Test Case 5: AES-XCBC-MAC-96 with 32-byte input extracting all 16 bytes of key@0xaaaaf0d15620
-| RFC 3566 Test Case 5: AES-XCBC-MAC-96 with 32-byte input: symkey-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae08
+| PRF symkey interface PRF AES_XCBC final-key@0xaaaad58a4620 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 3566 Test Case 5: AES-XCBC-MAC-96 with 32-byte input extracting all 16 bytes of key@0xaaaad58a4620
+| RFC 3566 Test Case 5: AES-XCBC-MAC-96 with 32-byte input: symkey-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: 72 21 cf 6d  67 ce 54 e3  4a 04 87 db  92 04 d9 be
-| RFC 3566 Test Case 5: AES-XCBC-MAC-96 with 32-byte input extracted len 16 bytes at 0xaaaaf0d12780
+| wrapper: siBuffer: 7c 4f ff 0c  09 be 3f 47  9d 90 92 58  8e a7 e6 03
+| RFC 3566 Test Case 5: AES-XCBC-MAC-96 with 32-byte input extracted len 16 bytes at 0xaaaad58a1780
 | unwrapped:
 |   f5 4f 0e c8  d2 b9 f3 d3  68 07 73 4b  d5 28 3f d4   .O......h.sK.(?.
 | verify_chunk_data: RFC 3566 Test Case 5: AES-XCBC-MAC-96 with 32-byte input: ok
@@ -10247,30 +10283,30 @@
 | decode_to_chunk: test_prf_vector: input "0xbecbb3bccdb518a30677d5481fb6b4d8"
 | decode_to_chunk: output: 
 |   be cb b3 bc  cd b5 18 a3  06 77 d5 48  1f b6 b4 d8   .........w.H....
-| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaaf0d11ec0 (length 16)
+| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaad58a0ec0 (length 16)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe780
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae60
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
+|     params: 8-bytes@0xfffffe02ade8
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6c8
-| PRF chunk interface PRF AES_XCBC 0xaaaaf0d130b0
-| PRF chunk interface PRF AES_XCBC update message (0xaaaaf0d11e80 length 34)
+|     params: 8-bytes@0xfffffe02ada8
+| PRF chunk interface PRF AES_XCBC 0xaaaad58a20b0
+| PRF chunk interface PRF AES_XCBC update message (0xaaaad58a0e80 length 34)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  14 15 16 17  18 19 1a 1b  1c 1d 1e 1f   ................
 |   20 21                                                 !
@@ -10278,11 +10314,11 @@
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  14 15 16 17  18 19 1a 1b  1c 1d 1e 1f   ................
 |   20 21                                                 !
-| K extracting all 16 bytes of key@0xaaaaf0d11ae0
-| K: symkey-key@0xaaaaf0d11ae0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a0ae0
+| K: symkey-key@0xaaaad58a0ae0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)623191333: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d13150
+| wrapper: (SECItemType)623191333: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a2150
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -10291,16 +10327,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe660
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe638
+|     params: 8-bytes@0xfffffe02ad18
 | Computing E[3] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -10321,45 +10357,45 @@
 | verify_chunk_data: RFC 3566 Test Case 6: AES-XCBC-MAC-96 with 34-byte input: ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d15620 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaaf0d11ae0 (size 16)
-| PRF symkey interface: key symkey-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaad58a0ae0 (size 16)
+| PRF symkey interface: key symkey-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
-| PRF symkey interface PRF AES_XCBC 0xaaaaf0d130b0
+|     params: 8-bytes@0xfffffe02ade8
+| PRF symkey interface PRF AES_XCBC 0xaaaad58a20b0
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 34
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 34-bytes
-|     base: base-key@0xaaaaf0d16ee0 (50-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (50-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaaf0d10070 (size 34)
-| PRF symkey interface: symkey message-key@0xaaaaf0d10070 (34-bytes, EXTRACT_KEY_FROM_KEY)
-| symkey message extracting all 34 bytes of key@0xaaaaf0d10070
-| symkey message: symkey-key@0xaaaaf0d10070 (34-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaad589f070 (size 34)
+| PRF symkey interface: symkey message-key@0xaaaad589f070 (34-bytes, EXTRACT_KEY_FROM_KEY)
+| symkey message extracting all 34 bytes of key@0xaaaad589f070
+| symkey message: symkey-key@0xaaaad589f070 (34-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 48
-| wrapper: siBuffer: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c  72 b6 75 ac  1c fd 43 48  fe 2a 4d 5a  67 b2 63 30  0a 5a cd d3  24 7d cf 8b  24 e9 4c a9  54 e5 71 24
-| symkey message extracted len 48 bytes at 0xaaaaf0d189d0
+| wrapper: siBuffer: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d  cf 81 9c 62  e6 5f eb 38  e8 e7 b5 3d  41 44 9e 5c  16 96 e6 01  ef 73 8e 28  4e 0f 42 01  43 c8 44 3a
+| symkey message extracted len 48 bytes at 0xaaaad58a79d0
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  14 15 16 17  18 19 1a 1b  1c 1d 1e 1f   ................
@@ -10368,11 +10404,11 @@
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  14 15 16 17  18 19 1a 1b  1c 1d 1e 1f   ................
 |   20 21                                                 !
-| K extracting all 16 bytes of key@0xaaaaf0d15620
-| K: symkey-key@0xaaaaf0d15620 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a4620
+| K: symkey-key@0xaaaad58a4620 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)2097152: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d11cd0
+| wrapper: (SECItemType)2097152: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a0cd0
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -10381,16 +10417,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6c0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ada0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
+|     params: 8-bytes@0xfffffe02ad78
 | Computing E[3] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -10406,23 +10442,23 @@
 |   be cb b3 bc  cd b5 18 a3  06 77 d5 48  1f b6 b4 d8   .........w.H....
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe728
-| PRF symkey interface PRF AES_XCBC final-key@0xaaaaf0d16ee0 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 3566 Test Case 6: AES-XCBC-MAC-96 with 34-byte input extracting all 16 bytes of key@0xaaaaf0d16ee0
-| RFC 3566 Test Case 6: AES-XCBC-MAC-96 with 34-byte input: symkey-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae08
+| PRF symkey interface PRF AES_XCBC final-key@0xaaaad58a5ee0 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 3566 Test Case 6: AES-XCBC-MAC-96 with 34-byte input extracting all 16 bytes of key@0xaaaad58a5ee0
+| RFC 3566 Test Case 6: AES-XCBC-MAC-96 with 34-byte input: symkey-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: 17 df ee b2  6c 27 44 cc  d1 3f ea 50  72 bc 5e 7a
-| RFC 3566 Test Case 6: AES-XCBC-MAC-96 with 34-byte input extracted len 16 bytes at 0xaaaaf0d12780
+| wrapper: siBuffer: 26 1d 21 78  09 03 2e 08  0d 75 85 9c  04 ea 57 dc
+| RFC 3566 Test Case 6: AES-XCBC-MAC-96 with 34-byte input extracted len 16 bytes at 0xaaaad58a1780
 | unwrapped:
 |   be cb b3 bc  cd b5 18 a3  06 77 d5 48  1f b6 b4 d8   .........w.H....
 | verify_chunk_data: RFC 3566 Test Case 6: AES-XCBC-MAC-96 with 34-byte input: ok
@@ -10434,30 +10470,30 @@
 | decode_to_chunk: test_prf_vector: input "0xf0dafee895db30253761103b5d84528f"
 | decode_to_chunk: output: 
 |   f0 da fe e8  95 db 30 25  37 61 10 3b  5d 84 52 8f   ......0%7a.;].R.
-| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaaf0d13a50 (length 16)
+| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaad58a2a50 (length 16)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe780
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae60
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
+|     params: 8-bytes@0xfffffe02ade8
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6c8
-| PRF chunk interface PRF AES_XCBC 0xaaaaf0d13970
-| PRF chunk interface PRF AES_XCBC update message (0xaaaaf0d10410 length 1000)
+|     params: 8-bytes@0xfffffe02ada8
+| PRF chunk interface PRF AES_XCBC 0xaaaad58a2970
+| PRF chunk interface PRF AES_XCBC update message (0xaaaad589f410 length 1000)
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
@@ -10585,11 +10621,11 @@
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 |   00 00 00 00  00 00 00 00                             ........
-| K extracting all 16 bytes of key@0xaaaaf0d11ae0
-| K: symkey-key@0xaaaaf0d11ae0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a0ae0
+| K: symkey-key@0xaaaad58a0ae0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)623191333: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d130b0
+| wrapper: (SECItemType)623191333: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a20b0
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -10598,16 +10634,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe660
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe638
+|     params: 8-bytes@0xfffffe02ad18
 | Computing E[63] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -10628,45 +10664,45 @@
 | verify_chunk_data: RFC 3566 Test Case 7: AES-XCBC-MAC-96 with 1000-byte input: ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaaf0d11ae0 (size 16)
-| PRF symkey interface: key symkey-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaad58a0ae0 (size 16)
+| PRF symkey interface: key symkey-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
-| PRF symkey interface PRF AES_XCBC 0xaaaaf0d13970
+|     params: 8-bytes@0xfffffe02ade8
+| PRF symkey interface PRF AES_XCBC 0xaaaad58a2970
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 1000
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 1000-bytes
-|     base: base-key@0xaaaaf0d15620 (1016-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (1016-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaaf0d10070 (size 1000)
-| PRF symkey interface: symkey message-key@0xaaaaf0d10070 (1000-bytes, EXTRACT_KEY_FROM_KEY)
-| symkey message extracting all 1000 bytes of key@0xaaaaf0d10070
-| symkey message: symkey-key@0xaaaaf0d10070 (1000-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaad589f070 (size 1000)
+| PRF symkey interface: symkey message-key@0xaaaad589f070 (1000-bytes, EXTRACT_KEY_FROM_KEY)
+| symkey message extracting all 1000 bytes of key@0xaaaad589f070
+| symkey message: symkey-key@0xaaaad589f070 (1000-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 1008
-| wrapper: siBuffer: ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09  ec 83 86 6e ...
-| symkey message extracted len 1008 bytes at 0xaaaaf0d1b150
+| wrapper: siBuffer: a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38  a1 d0 f6 3c ...
+| symkey message extracted len 1008 bytes at 0xaaaad58aa150
 | unwrapped:
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
@@ -10795,11 +10831,11 @@
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 |   00 00 00 00  00 00 00 00                             ........
-| K extracting all 16 bytes of key@0xaaaaf0d16ee0
-| K: symkey-key@0xaaaaf0d16ee0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a5ee0
+| K: symkey-key@0xaaaad58a5ee0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)2097152: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d130b0
+| wrapper: (SECItemType)2097152: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a20b0
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -10808,16 +10844,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6c0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ada0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
+|     params: 8-bytes@0xfffffe02ad78
 | Computing E[63] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -10833,23 +10869,23 @@
 |   f0 da fe e8  95 db 30 25  37 61 10 3b  5d 84 52 8f   ......0%7a.;].R.
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe728
-| PRF symkey interface PRF AES_XCBC final-key@0xaaaaf0d15620 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 3566 Test Case 7: AES-XCBC-MAC-96 with 1000-byte input extracting all 16 bytes of key@0xaaaaf0d15620
-| RFC 3566 Test Case 7: AES-XCBC-MAC-96 with 1000-byte input: symkey-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae08
+| PRF symkey interface PRF AES_XCBC final-key@0xaaaad58a4620 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 3566 Test Case 7: AES-XCBC-MAC-96 with 1000-byte input extracting all 16 bytes of key@0xaaaad58a4620
+| RFC 3566 Test Case 7: AES-XCBC-MAC-96 with 1000-byte input: symkey-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: 2a 83 8e 83  9c 20 b6 77  26 71 6d 7c  25 d3 89 a8
-| RFC 3566 Test Case 7: AES-XCBC-MAC-96 with 1000-byte input extracted len 16 bytes at 0xaaaaf0d13970
+| wrapper: siBuffer: 57 cb 46 d5  f1 e9 37 77  7e 9b 15 a2  53 76 bb 1b
+| RFC 3566 Test Case 7: AES-XCBC-MAC-96 with 1000-byte input extracted len 16 bytes at 0xaaaad58a2970
 | unwrapped:
 |   f0 da fe e8  95 db 30 25  37 61 10 3b  5d 84 52 8f   ......0%7a.;].R.
 | verify_chunk_data: RFC 3566 Test Case 7: AES-XCBC-MAC-96 with 1000-byte input: ok
@@ -10865,40 +10901,40 @@
 | decode_to_chunk: test_prf_vector: input "0x47f51b4564966215b8985c63055ed308"
 | decode_to_chunk: output: 
 |   47 f5 1b 45  64 96 62 15  b8 98 5c 63  05 5e d3 08   G..Ed.b...\c.^..
-| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaaf0d13150 (length 16)
+| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaad58a2150 (length 16)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe780
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae60
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
+|     params: 8-bytes@0xfffffe02ade8
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6c8
-| PRF chunk interface PRF AES_XCBC 0xaaaaf0d13970
-| PRF chunk interface PRF AES_XCBC update message (0xaaaaf0d11cd0 length 20)
+|     params: 8-bytes@0xfffffe02ada8
+| PRF chunk interface PRF AES_XCBC 0xaaaad58a2970
+| PRF chunk interface PRF AES_XCBC update message (0xaaaad58a0cd0 length 20)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
-| K extracting all 16 bytes of key@0xaaaaf0d11ae0
-| K: symkey-key@0xaaaaf0d11ae0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a0ae0
+| K: symkey-key@0xaaaad58a0ae0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)623191333: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d130b0
+| wrapper: (SECItemType)623191333: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a20b0
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -10907,16 +10943,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe660
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe638
+|     params: 8-bytes@0xfffffe02ad18
 | Computing E[2] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -10937,56 +10973,56 @@
 | verify_chunk_data: RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 16): ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d15620 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaaf0d11ae0 (size 16)
-| PRF symkey interface: key symkey-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaad58a0ae0 (size 16)
+| PRF symkey interface: key symkey-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | XCBC: Key 16=16 just right
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
-| PRF symkey interface PRF AES_XCBC 0xaaaaf0d130d0
+|     params: 8-bytes@0xfffffe02ade8
+| PRF symkey interface PRF AES_XCBC 0xaaaad58a20d0
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 20
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 20-bytes
-|     base: base-key@0xaaaaf0d16ee0 (36-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (36-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaaf0d10070 (size 20)
-| PRF symkey interface: symkey message-key@0xaaaaf0d10070 (20-bytes, EXTRACT_KEY_FROM_KEY)
-| symkey message extracting all 20 bytes of key@0xaaaaf0d10070
-| symkey message: symkey-key@0xaaaaf0d10070 (20-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaad589f070 (size 20)
+| PRF symkey interface: symkey message-key@0xaaaad589f070 (20-bytes, EXTRACT_KEY_FROM_KEY)
+| symkey message extracting all 20 bytes of key@0xaaaad589f070
+| symkey message: symkey-key@0xaaaad589f070 (20-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 32
-| wrapper: siBuffer: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c  ca 3c 45 41  95 65 d1 1d  61 3c 9f 77  ac f2 52 24
-| symkey message extracted len 32 bytes at 0xaaaaf0d15490
+| wrapper: siBuffer: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d  0b 48 53 19  27 85 e0 08  0f dc c0 d5  7d a1 8c 76
+| symkey message extracted len 32 bytes at 0xaaaad58a4490
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
-| K extracting all 16 bytes of key@0xaaaaf0d15620
-| K: symkey-key@0xaaaaf0d15620 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a4620
+| K: symkey-key@0xaaaad58a4620 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)2097152: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c
-| K extracted len 16 bytes at 0xaaaaf0d13970
+| wrapper: (SECItemType)2097152: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d
+| K extracted len 16 bytes at 0xaaaad58a2970
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 | XCBC: K:
@@ -10995,16 +11031,16 @@
 |   c3 52 80 57  54 23 7f 31  1a c0 ff f4  e3 e0 3e 78   .R.WT#.1......>x
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6c0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ada0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
+|     params: 8-bytes@0xfffffe02ad78
 | Computing E[2] using K3
 | XCBC: K3
 |   c1 a7 ab a1  a2 3a 94 06  58 07 a0 8c  c8 ee d0 6e   .....:..X......n
@@ -11020,23 +11056,23 @@
 |   47 f5 1b 45  64 96 62 15  b8 98 5c 63  05 5e d3 08   G..Ed.b...\c.^..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe728
-| PRF symkey interface PRF AES_XCBC final-key@0xaaaaf0d16ee0 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 16) extracting all 16 bytes of key@0xaaaaf0d16ee0
-| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 16): symkey-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae08
+| PRF symkey interface PRF AES_XCBC final-key@0xaaaad58a5ee0 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 16) extracting all 16 bytes of key@0xaaaad58a5ee0
+| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 16): symkey-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: a7 97 8c 63  e1 38 06 a4  b8 9c 24 63  b8 37 9b b2
-| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 16) extracted len 16 bytes at 0xaaaaf0d12780
+| wrapper: siBuffer: db 65 cd 11  fe da 6e d9  e3 46 38 df  1a 7c 97 2a
+| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 16) extracted len 16 bytes at 0xaaaad58a1780
 | unwrapped:
 |   47 f5 1b 45  64 96 62 15  b8 98 5c 63  05 5e d3 08   G..Ed.b...\c.^..
 | verify_chunk_data: RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 16): ok
@@ -11052,44 +11088,44 @@
 | decode_to_chunk: test_prf_vector: input "0x0fa087af7d866e7653434e602fdde835"
 | decode_to_chunk: output: 
 |   0f a0 87 af  7d 86 6e 76  53 43 4e 60  2f dd e8 35   ....}.nvSCN`/..5
-| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaaf0d13a50 (length 10)
+| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaad58a2a50 (length 10)
 |   00 01 02 03  04 05 06 07  08 09                      ..........
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe780
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae60
 |     key-offset: 0, key-size: 10
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 10-bytes
-|     base: base-key@0xaaaaf0d11ae0 (26-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (26-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
+|     params: 8-bytes@0xfffffe02ade8
 | XCBC: Key 10<16 too small, padding with zeros
 | CONCATENATE_BASE_AND_DATA:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d16ee0 (10-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6b0
+|     base: base-key@0xaaaad58a5ee0 (10-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ad90
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6c8
-| PRF chunk interface PRF AES_XCBC 0xaaaaf0d130d0
-| PRF chunk interface PRF AES_XCBC update message (0xaaaaf0d13970 length 20)
+|     params: 8-bytes@0xfffffe02ada8
+| PRF chunk interface PRF AES_XCBC 0xaaaad58a20d0
+| PRF chunk interface PRF AES_XCBC update message (0xaaaad58a2970 length 20)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
-| K extracting all 16 bytes of key@0xaaaaf0d10070
-| K: symkey-key@0xaaaaf0d10070 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad589f070
+| K: symkey-key@0xaaaad589f070 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)623191333: ca ba df 25  2c 9c 0b 3d  29 05 fd f2  7f 3b d3 4d
-| K extracted len 16 bytes at 0xaaaaf0d11e80
+| wrapper: (SECItemType)623191333: 23 87 24 81  ab df 3f cb  38 a4 70 22  ea 32 92 9f
+| K extracted len 16 bytes at 0xaaaad58a0e80
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 00 00  00 00 00 00   ................
 | XCBC: K:
@@ -11098,16 +11134,16 @@
 |   50 ca b2 4d  03 34 45 5e  40 7b 25 0f  dd 7c f8 d5   P..M.4E^@{%..|..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe660
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe638
+|     params: 8-bytes@0xfffffe02ad18
 | Computing E[2] using K3
 | XCBC: K3
 |   8e f7 48 db  56 f1 f7 26  24 72 f2 c5  63 b0 3f 88   ..H.V..&$r..c.?.
@@ -11128,60 +11164,60 @@
 | verify_chunk_data: RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 10): ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 10
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 10-bytes
-|     base: base-key@0xaaaaf0d16ee0 (26-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (26-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaaf0d10070 (size 10)
-| PRF symkey interface: key symkey-key@0xaaaaf0d10070 (10-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaad589f070 (size 10)
+| PRF symkey interface: key symkey-key@0xaaaad589f070 (10-bytes, EXTRACT_KEY_FROM_KEY)
 | XCBC: Key 10<16 too small, padding with zeros
 | CONCATENATE_BASE_AND_DATA:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d10070 (10-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6f0
+|     base: base-key@0xaaaad589f070 (10-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02add0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
-| PRF symkey interface PRF AES_XCBC 0xaaaaf0d130d0
+|     params: 8-bytes@0xfffffe02ade8
+| PRF symkey interface PRF AES_XCBC 0xaaaad58a20d0
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 20
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 20-bytes
-|     base: base-key@0xaaaaf0d15620 (36-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (36-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaaf0d16ee0 (size 20)
-| PRF symkey interface: symkey message-key@0xaaaaf0d16ee0 (20-bytes, EXTRACT_KEY_FROM_KEY)
-| symkey message extracting all 20 bytes of key@0xaaaaf0d16ee0
-| symkey message: symkey-key@0xaaaaf0d16ee0 (20-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaad58a5ee0 (size 20)
+| PRF symkey interface: symkey message-key@0xaaaad58a5ee0 (20-bytes, EXTRACT_KEY_FROM_KEY)
+| symkey message extracting all 20 bytes of key@0xaaaad58a5ee0
+| symkey message: symkey-key@0xaaaad58a5ee0 (20-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 32
-| wrapper: siBuffer: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c  ca 3c 45 41  95 65 d1 1d  61 3c 9f 77  ac f2 52 24
-| symkey message extracted len 32 bytes at 0xaaaaf0d15490
+| wrapper: siBuffer: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d  0b 48 53 19  27 85 e0 08  0f dc c0 d5  7d a1 8c 76
+| symkey message extracted len 32 bytes at 0xaaaad58a4490
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
-| K extracting all 16 bytes of key@0xaaaaf0d11ae0
-| K: symkey-key@0xaaaaf0d11ae0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a0ae0
+| K: symkey-key@0xaaaad58a0ae0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)2097152: ca ba df 25  2c 9c 0b 3d  29 05 fd f2  7f 3b d3 4d
-| K extracted len 16 bytes at 0xaaaaf0d11e80
+| wrapper: (SECItemType)2097152: 23 87 24 81  ab df 3f cb  38 a4 70 22  ea 32 92 9f
+| K extracted len 16 bytes at 0xaaaad58a0e80
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 00 00  00 00 00 00   ................
 | XCBC: K:
@@ -11190,16 +11226,16 @@
 |   50 ca b2 4d  03 34 45 5e  40 7b 25 0f  dd 7c f8 d5   P..M.4E^@{%..|..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6c0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ada0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
+|     params: 8-bytes@0xfffffe02ad78
 | Computing E[2] using K3
 | XCBC: K3
 |   8e f7 48 db  56 f1 f7 26  24 72 f2 c5  63 b0 3f 88   ..H.V..&$r..c.?.
@@ -11215,23 +11251,23 @@
 |   0f a0 87 af  7d 86 6e 76  53 43 4e 60  2f dd e8 35   ....}.nvSCN`/..5
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe728
-| PRF symkey interface PRF AES_XCBC final-key@0xaaaaf0d15620 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 10) extracting all 16 bytes of key@0xaaaaf0d15620
-| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 10): symkey-key@0xaaaaf0d15620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae08
+| PRF symkey interface PRF AES_XCBC final-key@0xaaaad58a4620 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 10) extracting all 16 bytes of key@0xaaaad58a4620
+| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 10): symkey-key@0xaaaad58a4620 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: 34 51 98 b7  8d 66 ac 99  a7 81 b2 ea  c8 39 1e 55
-| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 10) extracted len 16 bytes at 0xaaaaf0d130d0
+| wrapper: siBuffer: 23 62 f5 a9  95 58 22 b2  2f 12 28 74  db 00 41 84
+| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 10) extracted len 16 bytes at 0xaaaad58a20d0
 | unwrapped:
 |   0f a0 87 af  7d 86 6e 76  53 43 4e 60  2f dd e8 35   ....}.nvSCN`/..5
 | verify_chunk_data: RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 10): ok
@@ -11248,49 +11284,49 @@
 | decode_to_chunk: test_prf_vector: input "0x8cd3c93ae598a9803006ffb67c40e9e4"
 | decode_to_chunk: output: 
 |   8c d3 c9 3a  e5 98 a9 80  30 06 ff b6  7c 40 e9 e4   ...:....0...|@..
-| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaaf0d130b0 (length 18)
+| PRF chunk interface PRF AES_XCBC init key-chunk@0xaaaad58a20b0 (length 18)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   ed cb                                                ..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe780
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae60
 |     key-offset: 0, key-size: 18
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 18-bytes
-|     base: base-key@0xaaaaf0d10070 (34-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (34-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe708
+|     params: 8-bytes@0xfffffe02ade8
 | XCBC: Key 18>16 too big, rehashing to size
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe678
-| draft_chunk extracting all 18 bytes of key@0xaaaaf0d15620
-| draft_chunk: symkey-key@0xaaaaf0d15620 (18-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ad58
+| draft_chunk extracting all 18 bytes of key@0xaaaad58a4620
+| draft_chunk: symkey-key@0xaaaad58a4620 (18-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 32
-| wrapper: (SECItemType)1717921382: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c  96 fe c1 42  12 2a ff 7d  94 ba 88 10  82 f1 4e c3
-| draft_chunk extracted len 32 bytes at 0xaaaaf0d11930
+| wrapper: (SECItemType)1701209702: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d  98 1d 02 d8  54 f2 5b b9  68 27 bd 94  7a 3c 5e c6
+| draft_chunk extracted len 32 bytes at 0xaaaad58a0930
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   ed cb 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   ed cb                                                ..
-| K extracting all 16 bytes of key@0xaaaaf0d10070
-| K: symkey-key@0xaaaaf0d10070 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad589f070
+| K: symkey-key@0xaaaad589f070 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)774778414: ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09
-| K extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: (SECItemType)774778414: a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38
+| K extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | XCBC: K:
@@ -11299,16 +11335,16 @@
 |   e1 4d 5d 0e  e2 77 15 df  08 b4 15 2b  a2 3d a8 e0   .M]..w.....+.=..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe5e0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02acc0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe5b8
+|     params: 8-bytes@0xfffffe02ac98
 | Computing E[2] using K3
 | XCBC: K3
 |   8d 34 ef cb  3b d5 45 ca  06 2a ec df  ef 7c 0b fa   .4..;.E..*...|..
@@ -11324,28 +11360,28 @@
 |   5d 93 a5 3b  80 a3 e4 06  90 d2 4c ea  e1 44 9c 0e   ]..;......L..D..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe678
-| PRF chunk interface PRF AES_XCBC 0xaaaaf0d11930
-| PRF chunk interface PRF AES_XCBC update message (0xaaaaf0d13990 length 20)
+|     params: 8-bytes@0xfffffe02ad58
+| PRF chunk interface PRF AES_XCBC 0xaaaad58a0930
+| PRF chunk interface PRF AES_XCBC update message (0xaaaad58a2990 length 20)
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
-| K extracting all 16 bytes of key@0xaaaaf0d16ee0
-| K: symkey-key@0xaaaaf0d16ee0 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a5ee0
+| K: symkey-key@0xaaaad58a5ee0 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)623191333: a6 eb 31 c3  05 38 d3 cd  90 eb e8 5b  c4 6a e1 60
-| K extracted len 16 bytes at 0xaaaaf0cf6ab0
+| wrapper: (SECItemType)623191333: 1b 0a 8e e6  3e 8a aa 34  43 50 e5 5a  9a 00 68 2c
+| K extracted len 16 bytes at 0xaaaad5885ab0
 | unwrapped:
 |   5d 93 a5 3b  80 a3 e4 06  90 d2 4c ea  e1 44 9c 0e   ]..;......L..D..
 | XCBC: K:
@@ -11354,16 +11390,16 @@
 |   27 f3 88 2f  b7 b9 4b a4  16 36 09 d5  d2 39 c5 7f   '../..K..6...9..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe660
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe638
+|     params: 8-bytes@0xfffffe02ad18
 | Computing E[2] using K3
 | XCBC: K3
 |   50 9e d8 ae  74 5a 75 4c  93 4d 6c 91  98 fe e2 1b   P...tZuL.Ml.....
@@ -11384,46 +11420,46 @@
 | verify_chunk_data: RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 18): ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 18
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 18-bytes
-|     base: base-key@0xaaaaf0d15620 (34-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (34-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaaf0d16ee0 (size 18)
-| PRF symkey interface: key symkey-key@0xaaaaf0d16ee0 (18-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC init key symkey-key@0xaaaad58a5ee0 (size 18)
+| PRF symkey interface: key symkey-key@0xaaaad58a5ee0 (18-bytes, EXTRACT_KEY_FROM_KEY)
 | XCBC: Key 18>16 too big, rehashing to size
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6e0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02adc0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6b8
-| draft_chunk extracting all 18 bytes of key@0xaaaaf0d16ee0
-| draft_chunk: symkey-key@0xaaaaf0d16ee0 (18-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ad98
+| draft_chunk extracting all 18 bytes of key@0xaaaad58a5ee0
+| draft_chunk: symkey-key@0xaaaad58a5ee0 (18-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 32
-| wrapper: (SECItemType)-284171376: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c  96 fe c1 42  12 2a ff 7d  94 ba 88 10  82 f1 4e c3
-| draft_chunk extracted len 32 bytes at 0xaaaaf0d11930
+| wrapper: (SECItemType)-33379728: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d  98 1d 02 d8  54 f2 5b b9  68 27 bd 94  7a 3c 5e c6
+| draft_chunk extracted len 32 bytes at 0xaaaad58a0930
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   ed cb 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   ed cb                                                ..
-| K extracting all 16 bytes of key@0xaaaaf0d15620
-| K: symkey-key@0xaaaaf0d15620 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad58a4620
+| K: symkey-key@0xaaaad58a4620 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)774778414: ec 83 86 6e  d5 65 de 24  a8 34 a9 eb  eb 47 e3 09
-| K extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: (SECItemType)774778414: a1 d0 f6 3c  80 38 ce ea  c5 dc 2a 95  70 eb e1 38
+| K extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   00 00 00 00  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | XCBC: K:
@@ -11432,16 +11468,16 @@
 |   e1 4d 5d 0e  e2 77 15 df  08 b4 15 2b  a2 3d a8 e0   .M]..w.....+.=..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe620
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad00
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe5f8
+|     params: 8-bytes@0xfffffe02acd8
 | Computing E[2] using K3
 | XCBC: K3
 |   8d 34 ef cb  3b d5 45 ca  06 2a ec df  ef 7c 0b fa   .4..;.E..*...|..
@@ -11457,46 +11493,46 @@
 |   5d 93 a5 3b  80 a3 e4 06  90 d2 4c ea  e1 44 9c 0e   ]..;......L..D..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6e0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02adc0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6b8
-| PRF symkey interface PRF AES_XCBC 0xaaaaf0d11930
+|     params: 8-bytes@0xfffffe02ad98
+| PRF symkey interface PRF AES_XCBC 0xaaaad58a0930
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 20
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 20-bytes
-|     base: base-key@0xaaaaf0d11ae0 (36-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (36-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaaf0d15620 (size 20)
-| PRF symkey interface: symkey message-key@0xaaaaf0d15620 (20-bytes, EXTRACT_KEY_FROM_KEY)
-| symkey message extracting all 20 bytes of key@0xaaaaf0d15620
-| symkey message: symkey-key@0xaaaaf0d15620 (20-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF AES_XCBC update symkey message-key@0xaaaad58a4620 (size 20)
+| PRF symkey interface: symkey message-key@0xaaaad58a4620 (20-bytes, EXTRACT_KEY_FROM_KEY)
+| symkey message extracting all 20 bytes of key@0xaaaad58a4620
+| symkey message: symkey-key@0xaaaad58a4620 (20-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 32
-| wrapper: siBuffer: 26 44 4a 41  5c 59 68 08  ee 77 0b 07  31 f3 98 6c  ca 3c 45 41  95 65 d1 1d  61 3c 9f 77  ac f2 52 24
-| symkey message extracted len 32 bytes at 0xaaaaf0d15550
+| wrapper: siBuffer: 37 60 35 6b  40 3c 2b 85  b6 92 2e 17  8c a8 75 4d  0b 48 53 19  27 85 e0 08  0f dc c0 d5  7d a1 8c 76
+| symkey message extracted len 32 bytes at 0xaaaad58a4550
 | unwrapped:
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13  00 00 00 00  00 00 00 00  00 00 00 00   ................
 | XCBC: data
 |   00 01 02 03  04 05 06 07  08 09 0a 0b  0c 0d 0e 0f   ................
 |   10 11 12 13                                          ....
-| K extracting all 16 bytes of key@0xaaaaf0d10070
-| K: symkey-key@0xaaaaf0d10070 (16-bytes, AES_ECB)
+| K extracting all 16 bytes of key@0xaaaad589f070
+| K: symkey-key@0xaaaad589f070 (16-bytes, AES_ECB)
 | sizeof bytes 16
-| wrapper: (SECItemType)2097152: a6 eb 31 c3  05 38 d3 cd  90 eb e8 5b  c4 6a e1 60
-| K extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: (SECItemType)2097152: 1b 0a 8e e6  3e 8a aa 34  43 50 e5 5a  9a 00 68 2c
+| K extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   5d 93 a5 3b  80 a3 e4 06  90 d2 4c ea  e1 44 9c 0e   ]..;......L..D..
 | XCBC: K:
@@ -11505,16 +11541,16 @@
 |   27 f3 88 2f  b7 b9 4b a4  16 36 09 d5  d2 39 c5 7f   '../..K..6...9..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe6c0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ada0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: AES_ECB
 |     flags: SIGN
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
+|     params: 8-bytes@0xfffffe02ad78
 | Computing E[2] using K3
 | XCBC: K3
 |   50 9e d8 ae  74 5a 75 4c  93 4d 6c 91  98 fe e2 1b   P...tZuL.Ml.....
@@ -11530,23 +11566,23 @@
 |   8c d3 c9 3a  e5 98 a9 80  30 06 ff b6  7c 40 e9 e4   ...:....0...|@..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe7a0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae80
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe728
-| PRF symkey interface PRF AES_XCBC final-key@0xaaaaf0d11ae0 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 18) extracting all 16 bytes of key@0xaaaaf0d11ae0
-| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 18): symkey-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae08
+| PRF symkey interface PRF AES_XCBC final-key@0xaaaad58a0ae0 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 18) extracting all 16 bytes of key@0xaaaad58a0ae0
+| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 18): symkey-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: a6 d7 5f e5  e1 71 a4 89  e5 fd 34 56  4e 3a b4 b9
-| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 18) extracted len 16 bytes at 0xaaaaf0d130d0
+| wrapper: siBuffer: 48 75 95 e8  d7 ef fa 82  9b 3f be f3  db 6f 6e b5
+| RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 18) extracted len 16 bytes at 0xaaaad58a20d0
 | unwrapped:
 |   8c d3 c9 3a  e5 98 a9 80  30 06 ff b6  7c 40 e9 e4   ...:....0...|@..
 | verify_chunk_data: RFC 4434 Test Case AES-XCBC-PRF-128 with 20-byte input (key length 18): ok
@@ -11562,63 +11598,63 @@
 | decode_to_chunk: test_prf_vector: input "0x9294727a3638bb1c13f48ef8158bfc9d"
 | decode_to_chunk: output: 
 |   92 94 72 7a  36 38 bb 1c  13 f4 8e f8  15 8b fc 9d   ..rz68..........
-| PRF chunk interface PRF HMAC_MD5 init key-chunk@0xaaaaf0d13150 (length 16)
+| PRF chunk interface PRF HMAC_MD5 init key-chunk@0xaaaad58a2150 (length 16)
 |   0b 0b 0b 0b  0b 0b 0b 0b  0b 0b 0b 0b  0b 0b 0b 0b   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe760
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6e8
+|     params: 8-bytes@0xfffffe02adc8
 | CONCATENATE_BASE_AND_DATA:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d11ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe690
+|     base: base-key@0xaaaad58a0ae0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ad70
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d16ee0 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6d0
-| PRF chunk interface PRF HMAC_MD5 0xaaaaf0d16e20
-| PRF chunk interface PRF HMAC_MD5 update message (0xaaaaf0d13d10 length 8)
+|     base: base-key@0xaaaad58a5ee0 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02adb0
+| PRF chunk interface PRF HMAC_MD5 0xaaaad58a5e20
+| PRF chunk interface PRF HMAC_MD5 update message (0xaaaad58a2d10 length 8)
 |   48 69 20 54  68 65 72 65                             Hi There
 | CONCATENATE_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d11ae0 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 16-bytes@0xffffef0fe800
-| PRF HMAC inner hash hash MD5 inner-key@0xaaaaf0d15620 (size 72)
+|     base: base-key@0xaaaad58a0ae0 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 16-bytes@0xfffffe02aee0
+| PRF HMAC inner hash hash MD5 inner-key@0xaaaad58a4620 (size 72)
 | PRF HMAC inner hash hash MD5 init
-| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaaf0d15620 (size 72)
-| PRF HMAC inner hash: inner-key@0xaaaaf0d15620 (72-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaad58a4620 (size 72)
+| PRF HMAC inner hash: inner-key@0xaaaad58a4620 (72-bytes, CONCATENATE_BASE_AND_DATA)
 | PRF HMAC inner hash hash MD5 final length 16
 |   90 1d 23 73  2e dc c0 f1  a1 06 53 2f  6b e5 ec eb   ..#s......S/k...
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe5e0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02acc0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe568
+|     params: 8-bytes@0xfffffe02ac48
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d16ee0 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6b0
+|     base: base-key@0xaaaad58a5ee0 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ad90
 | CONCATENATE_BASE_AND_KEY:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d15620 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 8-bytes@0xffffef0fe688
+|     base: base-key@0xaaaad58a4620 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 8-bytes@0xfffffe02ad68
 | PRF HMAC outer hash hash MD5 init
-| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaaf0d10070 (size 80)
-| PRF HMAC outer hash: outer-key@0xaaaaf0d10070 (80-bytes, CONCATENATE_BASE_AND_DATA)
-| PRF HMAC outer hash hash MD5 final bytes@0xffffef0fe808 (length 16)
+| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaad589f070 (size 80)
+| PRF HMAC outer hash: outer-key@0xaaaad589f070 (80-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC outer hash hash MD5 final bytes@0xfffffe02aee8 (length 16)
 |   92 94 72 7a  36 38 bb 1c  13 f4 8e f8  15 8b fc 9d   ..rz68..........
 | PRF chunk interface PRF HMAC_MD5 final length 16
 |   92 94 72 7a  36 38 bb 1c  13 f4 8e f8  15 8b fc 9d   ..rz68..........
@@ -11627,94 +11663,94 @@
 | verify_chunk_data: RFC 2104: MD5_HMAC test 1: ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF HMAC_MD5 init key symkey-key@0xaaaaf0d10070 (size 16)
-| PRF symkey interface: key symkey-key@0xaaaaf0d10070 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF HMAC_MD5 init key symkey-key@0xaaaad589f070 (size 16)
+| PRF symkey interface: key symkey-key@0xaaaad589f070 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | CONCATENATE_BASE_AND_DATA:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d10070 (16-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6a0
+|     base: base-key@0xaaaad589f070 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ad80
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d16ee0 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6e0
-| PRF symkey interface PRF HMAC_MD5 0xaaaaf0d186e0
+|     base: base-key@0xaaaad58a5ee0 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02adc0
+| PRF symkey interface PRF HMAC_MD5 0xaaaad58a76e0
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 8
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 8-bytes
-|     base: base-key@0xaaaaf0d187a0 (24-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (24-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF HMAC_MD5 update symkey message-key@0xaaaaf0d15620 (size 8)
-| PRF symkey interface: symkey message-key@0xaaaaf0d15620 (8-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF HMAC_MD5 update symkey message-key@0xaaaad58a4620 (size 8)
+| PRF symkey interface: symkey message-key@0xaaaad58a4620 (8-bytes, EXTRACT_KEY_FROM_KEY)
 | CONCATENATE_BASE_AND_KEY:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d11ae0 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 8-bytes@0xffffef0fe818
-| PRF HMAC inner hash hash MD5 inner-key@0xaaaaf0d187a0 (size 72)
+|     base: base-key@0xaaaad58a0ae0 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 8-bytes@0xfffffe02aef8
+| PRF HMAC inner hash hash MD5 inner-key@0xaaaad58a77a0 (size 72)
 | PRF HMAC inner hash hash MD5 init
-| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaaf0d187a0 (size 72)
-| PRF HMAC inner hash: inner-key@0xaaaaf0d187a0 (72-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaad58a77a0 (size 72)
+| PRF HMAC inner hash: inner-key@0xaaaad58a77a0 (72-bytes, CONCATENATE_BASE_AND_DATA)
 | PRF HMAC inner hash hash MD5 final length 16
 |   90 1d 23 73  2e dc c0 f1  a1 06 53 2f  6b e5 ec eb   ..#s......S/k...
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe650
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad30
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d18710 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a7710 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe5d8
+|     params: 8-bytes@0xfffffe02acb8
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d16ee0 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe720
+|     base: base-key@0xaaaad58a5ee0 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ae00
 | CONCATENATE_BASE_AND_KEY:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d187a0 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 8-bytes@0xffffef0fe6f8
-| PRF HMAC outer hash hash MD5 outer-key@0xaaaaf0d18710 (size 80)
+|     base: base-key@0xaaaad58a77a0 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 8-bytes@0xfffffe02add8
+| PRF HMAC outer hash hash MD5 outer-key@0xaaaad58a7710 (size 80)
 | PRF HMAC outer hash hash MD5 init
-| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaaf0d18710 (size 80)
-| PRF HMAC outer hash: outer-key@0xaaaaf0d18710 (80-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaad58a7710 (size 80)
+| PRF HMAC outer hash: outer-key@0xaaaad58a7710 (80-bytes, CONCATENATE_BASE_AND_DATA)
 | PRF HMAC outer hash hash MD5 final length 16
 |   92 94 72 7a  36 38 bb 1c  13 f4 8e f8  15 8b fc 9d   ..rz68..........
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe710
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02adf0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
-|     :  hashed-outer-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| PRF symkey interface PRF HMAC_MD5 final-key@0xaaaaf0d16ee0 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 2104: MD5_HMAC test 1 extracting all 16 bytes of key@0xaaaaf0d16ee0
-| RFC 2104: MD5_HMAC test 1: symkey-key@0xaaaaf0d16ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ad78
+|     :  hashed-outer-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| PRF symkey interface PRF HMAC_MD5 final-key@0xaaaad58a5ee0 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 2104: MD5_HMAC test 1 extracting all 16 bytes of key@0xaaaad58a5ee0
+| RFC 2104: MD5_HMAC test 1: symkey-key@0xaaaad58a5ee0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: 7d 37 9e c5  d7 d3 67 bf  90 aa fc cd  00 b2 28 56
-| RFC 2104: MD5_HMAC test 1 extracted len 16 bytes at 0xaaaaf0d15400
+| wrapper: siBuffer: 40 62 73 52  9b 76 1e 22  65 8d 8e 00  cf 38 5d 13
+| RFC 2104: MD5_HMAC test 1 extracted len 16 bytes at 0xaaaad58a4400
 | unwrapped:
 |   92 94 72 7a  36 38 bb 1c  13 f4 8e f8  15 8b fc 9d   ..rz68..........
 | verify_chunk_data: RFC 2104: MD5_HMAC test 1: ok
@@ -11730,64 +11766,64 @@
 | decode_to_chunk: test_prf_vector: input "0x750c783e6ab0b503eaa86e310a5db738"
 | decode_to_chunk: output: 
 |   75 0c 78 3e  6a b0 b5 03  ea a8 6e 31  0a 5d b7 38   u.x>j.....n1.].8
-| PRF chunk interface PRF HMAC_MD5 init key-chunk@0xaaaaf0d11cd0 (length 4)
+| PRF chunk interface PRF HMAC_MD5 init key-chunk@0xaaaad58a0cd0 (length 4)
 |   4a 65 66 65                                          Jefe
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe760
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae40
 |     key-offset: 0, key-size: 4
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 4-bytes
-|     base: base-key@0xaaaaf0d10070 (20-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (20-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6e8
+|     params: 8-bytes@0xfffffe02adc8
 | CONCATENATE_BASE_AND_DATA:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d16ee0 (4-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe690
+|     base: base-key@0xaaaad58a5ee0 (4-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ad70
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d10070 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6d0
-| PRF chunk interface PRF HMAC_MD5 0xaaaaf0d11960
-| PRF chunk interface PRF HMAC_MD5 update message (0xaaaaf0d186e0 length 28)
+|     base: base-key@0xaaaad589f070 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02adb0
+| PRF chunk interface PRF HMAC_MD5 0xaaaad58a0960
+| PRF chunk interface PRF HMAC_MD5 update message (0xaaaad58a76e0 length 28)
 |   77 68 61 74  20 64 6f 20  79 61 20 77  61 6e 74 20   what do ya want 
 |   66 6f 72 20  6e 6f 74 68  69 6e 67 3f                for nothing?
 | CONCATENATE_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d16ee0 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 16-bytes@0xffffef0fe800
-| PRF HMAC inner hash hash MD5 inner-key@0xaaaaf0d15620 (size 92)
+|     base: base-key@0xaaaad58a5ee0 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 16-bytes@0xfffffe02aee0
+| PRF HMAC inner hash hash MD5 inner-key@0xaaaad58a4620 (size 92)
 | PRF HMAC inner hash hash MD5 init
-| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaaf0d15620 (size 92)
-| PRF HMAC inner hash: inner-key@0xaaaaf0d15620 (92-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaad58a4620 (size 92)
+| PRF HMAC inner hash: inner-key@0xaaaad58a4620 (92-bytes, CONCATENATE_BASE_AND_DATA)
 | PRF HMAC inner hash hash MD5 final length 16
 |   c3 db 14 c0  65 f5 52 03  b0 33 c8 1a  69 7b 97 c5   ....e.R..3..i{..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe5e0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02acc0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d18710 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a7710 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe568
+|     params: 8-bytes@0xfffffe02ac48
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d10070 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6b0
+|     base: base-key@0xaaaad589f070 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ad90
 | CONCATENATE_BASE_AND_KEY:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d15620 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 8-bytes@0xffffef0fe688
+|     base: base-key@0xaaaad58a4620 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 8-bytes@0xfffffe02ad68
 | PRF HMAC outer hash hash MD5 init
-| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaaf0d18710 (size 80)
-| PRF HMAC outer hash: outer-key@0xaaaaf0d18710 (80-bytes, CONCATENATE_BASE_AND_DATA)
-| PRF HMAC outer hash hash MD5 final bytes@0xffffef0fe808 (length 16)
+| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaad58a7710 (size 80)
+| PRF HMAC outer hash: outer-key@0xaaaad58a7710 (80-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC outer hash hash MD5 final bytes@0xfffffe02aee8 (length 16)
 |   75 0c 78 3e  6a b0 b5 03  ea a8 6e 31  0a 5d b7 38   u.x>j.....n1.].8
 | PRF chunk interface PRF HMAC_MD5 final length 16
 |   75 0c 78 3e  6a b0 b5 03  ea a8 6e 31  0a 5d b7 38   u.x>j.....n1.].8
@@ -11796,94 +11832,94 @@
 | verify_chunk_data: RFC 2104: MD5_HMAC test 2: ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 4
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 4-bytes
-|     base: base-key@0xaaaaf0d10070 (20-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (20-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF HMAC_MD5 init key symkey-key@0xaaaaf0d18710 (size 4)
-| PRF symkey interface: key symkey-key@0xaaaaf0d18710 (4-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF HMAC_MD5 init key symkey-key@0xaaaad58a7710 (size 4)
+| PRF symkey interface: key symkey-key@0xaaaad58a7710 (4-bytes, EXTRACT_KEY_FROM_KEY)
 | CONCATENATE_BASE_AND_DATA:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d18710 (4-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6a0
+|     base: base-key@0xaaaad58a7710 (4-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ad80
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d10070 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6e0
-| PRF symkey interface PRF HMAC_MD5 0xaaaaf0d11960
+|     base: base-key@0xaaaad589f070 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02adc0
+| PRF symkey interface PRF HMAC_MD5 0xaaaad58a0960
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 28
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 28-bytes
-|     base: base-key@0xaaaaf0d11ae0 (44-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (44-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF HMAC_MD5 update symkey message-key@0xaaaaf0d15620 (size 28)
-| PRF symkey interface: symkey message-key@0xaaaaf0d15620 (28-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF HMAC_MD5 update symkey message-key@0xaaaad58a4620 (size 28)
+| PRF symkey interface: symkey message-key@0xaaaad58a4620 (28-bytes, EXTRACT_KEY_FROM_KEY)
 | CONCATENATE_BASE_AND_KEY:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d16ee0 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 8-bytes@0xffffef0fe818
-| PRF HMAC inner hash hash MD5 inner-key@0xaaaaf0d11ae0 (size 92)
+|     base: base-key@0xaaaad58a5ee0 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 8-bytes@0xfffffe02aef8
+| PRF HMAC inner hash hash MD5 inner-key@0xaaaad58a0ae0 (size 92)
 | PRF HMAC inner hash hash MD5 init
-| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaaf0d11ae0 (size 92)
-| PRF HMAC inner hash: inner-key@0xaaaaf0d11ae0 (92-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaad58a0ae0 (size 92)
+| PRF HMAC inner hash: inner-key@0xaaaad58a0ae0 (92-bytes, CONCATENATE_BASE_AND_DATA)
 | PRF HMAC inner hash hash MD5 final length 16
 |   c3 db 14 c0  65 f5 52 03  b0 33 c8 1a  69 7b 97 c5   ....e.R..3..i{..
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe650
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad30
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe5d8
+|     params: 8-bytes@0xfffffe02acb8
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d10070 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe720
+|     base: base-key@0xaaaad589f070 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ae00
 | CONCATENATE_BASE_AND_KEY:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d11ae0 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 8-bytes@0xffffef0fe6f8
-| PRF HMAC outer hash hash MD5 outer-key@0xaaaaf0d187a0 (size 80)
+|     base: base-key@0xaaaad58a0ae0 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 8-bytes@0xfffffe02add8
+| PRF HMAC outer hash hash MD5 outer-key@0xaaaad58a77a0 (size 80)
 | PRF HMAC outer hash hash MD5 init
-| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaaf0d187a0 (size 80)
-| PRF HMAC outer hash: outer-key@0xaaaaf0d187a0 (80-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaad58a77a0 (size 80)
+| PRF HMAC outer hash: outer-key@0xaaaad58a77a0 (80-bytes, CONCATENATE_BASE_AND_DATA)
 | PRF HMAC outer hash hash MD5 final length 16
 |   75 0c 78 3e  6a b0 b5 03  ea a8 6e 31  0a 5d b7 38   u.x>j.....n1.].8
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe710
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02adf0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d16ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
-|     :  hashed-outer-key@0xaaaaf0d10070 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| PRF symkey interface PRF HMAC_MD5 final-key@0xaaaaf0d10070 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d10070 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d10070 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 2104: MD5_HMAC test 2 extracting all 16 bytes of key@0xaaaaf0d10070
-| RFC 2104: MD5_HMAC test 2: symkey-key@0xaaaaf0d10070 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ad78
+|     :  hashed-outer-key@0xaaaad589f070 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| PRF symkey interface PRF HMAC_MD5 final-key@0xaaaad589f070 (size 16)
+| PRF symkey interface: key-key@0xaaaad589f070 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad589f070 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 2104: MD5_HMAC test 2 extracting all 16 bytes of key@0xaaaad589f070
+| RFC 2104: MD5_HMAC test 2: symkey-key@0xaaaad589f070 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: 6e a9 d3 19  19 57 07 1f  c9 e7 25 1f  89 72 fc 30
-| RFC 2104: MD5_HMAC test 2 extracted len 16 bytes at 0xaaaaf0d11960
+| wrapper: siBuffer: a4 0c 22 7f  17 c8 57 47  b8 f6 d3 24  62 6f d0 4a
+| RFC 2104: MD5_HMAC test 2 extracted len 16 bytes at 0xaaaad58a0960
 | unwrapped:
 |   75 0c 78 3e  6a b0 b5 03  ea a8 6e 31  0a 5d b7 38   u.x>j.....n1.].8
 | verify_chunk_data: RFC 2104: MD5_HMAC test 2: ok
@@ -11901,66 +11937,66 @@
 | decode_to_chunk: test_prf_vector: input "0x56be34521d144c88dbb8c733f0e8b3f6"
 | decode_to_chunk: output: 
 |   56 be 34 52  1d 14 4c 88  db b8 c7 33  f0 e8 b3 f6   V.4R..L....3....
-| PRF chunk interface PRF HMAC_MD5 init key-chunk@0xaaaaf0cf6ab0 (length 16)
+| PRF chunk interface PRF HMAC_MD5 init key-chunk@0xaaaad5885ab0 (length 16)
 |   aa aa aa aa  aa aa aa aa  aa aa aa aa  aa aa aa aa   ................
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe760
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ae40
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d18710 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a7710 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe6e8
+|     params: 8-bytes@0xfffffe02adc8
 | CONCATENATE_BASE_AND_DATA:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d10070 (16-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe690
+|     base: base-key@0xaaaad589f070 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ad70
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d18710 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6d0
-| PRF chunk interface PRF HMAC_MD5 0xaaaaf0d186e0
-| PRF chunk interface PRF HMAC_MD5 update message (0xaaaaf0d13970 length 50)
+|     base: base-key@0xaaaad58a7710 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02adb0
+| PRF chunk interface PRF HMAC_MD5 0xaaaad58a76e0
+| PRF chunk interface PRF HMAC_MD5 update message (0xaaaad58a2970 length 50)
 |   dd dd dd dd  dd dd dd dd  dd dd dd dd  dd dd dd dd   ................
 |   dd dd dd dd  dd dd dd dd  dd dd dd dd  dd dd dd dd   ................
 |   dd dd dd dd  dd dd dd dd  dd dd dd dd  dd dd dd dd   ................
 |   dd dd                                                ..
 | CONCATENATE_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d10070 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 16-bytes@0xffffef0fe800
-| PRF HMAC inner hash hash MD5 inner-key@0xaaaaf0d15620 (size 114)
+|     base: base-key@0xaaaad589f070 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 16-bytes@0xfffffe02aee0
+| PRF HMAC inner hash hash MD5 inner-key@0xaaaad58a4620 (size 114)
 | PRF HMAC inner hash hash MD5 init
-| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaaf0d15620 (size 114)
-| PRF HMAC inner hash: inner-key@0xaaaaf0d15620 (114-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaad58a4620 (size 114)
+| PRF HMAC inner hash: inner-key@0xaaaad58a4620 (114-bytes, CONCATENATE_BASE_AND_DATA)
 | PRF HMAC inner hash hash MD5 final length 16
 |   82 0a 6b 33  5d 18 7b 90  dc ba b1 7e  f5 b4 26 ff   ..k3].{....~..&.
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe5e0
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02acc0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d187a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe568
+|     params: 8-bytes@0xfffffe02ac48
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d18710 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6b0
+|     base: base-key@0xaaaad58a7710 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ad90
 | CONCATENATE_BASE_AND_KEY:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d15620 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 8-bytes@0xffffef0fe688
+|     base: base-key@0xaaaad58a4620 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 8-bytes@0xfffffe02ad68
 | PRF HMAC outer hash hash MD5 init
-| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaaf0d187a0 (size 80)
-| PRF HMAC outer hash: outer-key@0xaaaaf0d187a0 (80-bytes, CONCATENATE_BASE_AND_DATA)
-| PRF HMAC outer hash hash MD5 final bytes@0xffffef0fe808 (length 16)
+| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaad58a77a0 (size 80)
+| PRF HMAC outer hash: outer-key@0xaaaad58a77a0 (80-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC outer hash hash MD5 final bytes@0xfffffe02aee8 (length 16)
 |   56 be 34 52  1d 14 4c 88  db b8 c7 33  f0 e8 b3 f6   V.4R..L....3....
 | PRF chunk interface PRF HMAC_MD5 final length 16
 |   56 be 34 52  1d 14 4c 88  db b8 c7 33  f0 e8 b3 f6   V.4R..L....3....
@@ -11969,94 +12005,94 @@
 | verify_chunk_data: RFC 2104: MD5_HMAC test 3: ok
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d18710 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a7710 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF HMAC_MD5 init key symkey-key@0xaaaaf0d187a0 (size 16)
-| PRF symkey interface: key symkey-key@0xaaaaf0d187a0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF HMAC_MD5 init key symkey-key@0xaaaad58a77a0 (size 16)
+| PRF symkey interface: key symkey-key@0xaaaad58a77a0 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | CONCATENATE_BASE_AND_DATA:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d187a0 (16-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6a0
+|     base: base-key@0xaaaad58a77a0 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ad80
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d18710 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe6e0
-| PRF symkey interface PRF HMAC_MD5 0xaaaaf0d186e0
+|     base: base-key@0xaaaad58a7710 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02adc0
+| PRF symkey interface PRF HMAC_MD5 0xaaaad58a76e0
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 50
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 50-bytes
-|     base: base-key@0xaaaaf0d16ee0 (66-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (66-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
-| PRF symkey interface PRF HMAC_MD5 update symkey message-key@0xaaaaf0d15620 (size 50)
-| PRF symkey interface: symkey message-key@0xaaaaf0d15620 (50-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ae78
+| PRF symkey interface PRF HMAC_MD5 update symkey message-key@0xaaaad58a4620 (size 50)
+| PRF symkey interface: symkey message-key@0xaaaad58a4620 (50-bytes, EXTRACT_KEY_FROM_KEY)
 | CONCATENATE_BASE_AND_KEY:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d10070 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 8-bytes@0xffffef0fe818
-| PRF HMAC inner hash hash MD5 inner-key@0xaaaaf0d16ee0 (size 114)
+|     base: base-key@0xaaaad589f070 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 8-bytes@0xfffffe02aef8
+| PRF HMAC inner hash hash MD5 inner-key@0xaaaad58a5ee0 (size 114)
 | PRF HMAC inner hash hash MD5 init
-| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaaf0d16ee0 (size 114)
-| PRF HMAC inner hash: inner-key@0xaaaaf0d16ee0 (114-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC inner hash hash MD5 digest inner-key@0xaaaad58a5ee0 (size 114)
+| PRF HMAC inner hash: inner-key@0xaaaad58a5ee0 (114-bytes, CONCATENATE_BASE_AND_DATA)
 | PRF HMAC inner hash hash MD5 final length 16
 |   82 0a 6b 33  5d 18 7b 90  dc ba b1 7e  f5 b4 26 ff   ..k3].{....~..&.
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe650
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02ad30
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d11ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a0ae0 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe5d8
+|     params: 8-bytes@0xfffffe02acb8
 | XOR_BASE_AND_DATA:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d18710 (64-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 16-bytes@0xffffef0fe720
+|     base: base-key@0xaaaad58a7710 (64-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 16-bytes@0xfffffe02ae00
 | CONCATENATE_BASE_AND_KEY:
 |     target: CONCATENATE_BASE_AND_DATA
-|     base: base-key@0xaaaaf0d16ee0 (64-bytes, CONCATENATE_BASE_AND_DATA)
-|     params: 8-bytes@0xffffef0fe6f8
-| PRF HMAC outer hash hash MD5 outer-key@0xaaaaf0d11ae0 (size 80)
+|     base: base-key@0xaaaad58a5ee0 (64-bytes, CONCATENATE_BASE_AND_DATA)
+|     params: 8-bytes@0xfffffe02add8
+| PRF HMAC outer hash hash MD5 outer-key@0xaaaad58a0ae0 (size 80)
 | PRF HMAC outer hash hash MD5 init
-| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaaf0d11ae0 (size 80)
-| PRF HMAC outer hash: outer-key@0xaaaaf0d11ae0 (80-bytes, CONCATENATE_BASE_AND_DATA)
+| PRF HMAC outer hash hash MD5 digest outer-key@0xaaaad58a0ae0 (size 80)
+| PRF HMAC outer hash: outer-key@0xaaaad58a0ae0 (80-bytes, CONCATENATE_BASE_AND_DATA)
 | PRF HMAC outer hash hash MD5 final length 16
 |   56 be 34 52  1d 14 4c 88  db b8 c7 33  f0 e8 b3 f6   V.4R..L....3....
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe710
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02adf0
 |     key-offset: 0, key-size: 16
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 16-bytes
-|     base: base-key@0xaaaaf0d10070 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad589f070 (32-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe698
-|     :  hashed-outer-key@0xaaaaf0d18710 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| PRF symkey interface PRF HMAC_MD5 final-key@0xaaaaf0d18710 (size 16)
-| PRF symkey interface: key-key@0xaaaaf0d18710 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| output: symkey-key@0xaaaaf0d18710 (16-bytes, EXTRACT_KEY_FROM_KEY)
-| RFC 2104: MD5_HMAC test 3 extracting all 16 bytes of key@0xaaaaf0d18710
-| RFC 2104: MD5_HMAC test 3: symkey-key@0xaaaaf0d18710 (16-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 8-bytes@0xfffffe02ad78
+|     :  hashed-outer-key@0xaaaad58a7710 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| PRF symkey interface PRF HMAC_MD5 final-key@0xaaaad58a7710 (size 16)
+| PRF symkey interface: key-key@0xaaaad58a7710 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| output: symkey-key@0xaaaad58a7710 (16-bytes, EXTRACT_KEY_FROM_KEY)
+| RFC 2104: MD5_HMAC test 3 extracting all 16 bytes of key@0xaaaad58a7710
+| RFC 2104: MD5_HMAC test 3: symkey-key@0xaaaad58a7710 (16-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 16
-| wrapper: siBuffer: 2c 4f 7a aa  13 57 28 e9  64 6b 4f a7  2c f9 a5 3c
-| RFC 2104: MD5_HMAC test 3 extracted len 16 bytes at 0xaaaaf0d186e0
+| wrapper: siBuffer: 58 fc ea 0b  f2 e1 52 36  12 ea 2e ce  0d 36 6a 93
+| RFC 2104: MD5_HMAC test 3 extracted len 16 bytes at 0xaaaad58a76e0
 | unwrapped:
 |   56 be 34 52  1d 14 4c 88  db b8 c7 33  f0 e8 b3 f6   V.4R..L....3....
 | verify_chunk_data: RFC 2104: MD5_HMAC test 3: ok
@@ -12104,24 +12140,24 @@
 |   a7 a5 6c c4                                          ..l.
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 32
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 32-bytes
-|     base: base-key@0xaaaaf0d187a0 (48-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (48-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
+|     params: 8-bytes@0xfffffe02ae78
 | NSS_IKE_PRF_DERIVE:
 |     target: NSS_IKE_PRF_PLUS_DERIVE
-|     base: base-key@0xaaaaf0d18710 (32-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 56-bytes@0xffffef0fe830
-| CAVP: IKEv2 key derivation with HMAC-SHA1 extracting all 20 bytes of key@0xaaaaf0d187a0
-| CAVP: IKEv2 key derivation with HMAC-SHA1: symkey-key@0xaaaaf0d187a0 (20-bytes, NSS_IKE_PRF_PLUS_DERIVE)
+|     base: base-key@0xaaaad58a7710 (32-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 56-bytes@0xfffffe02af10
+| CAVP: IKEv2 key derivation with HMAC-SHA1 extracting all 20 bytes of key@0xaaaad58a77a0
+| CAVP: IKEv2 key derivation with HMAC-SHA1: symkey-key@0xaaaad58a77a0 (20-bytes, NSS_IKE_PRF_PLUS_DERIVE)
 | sizeof bytes 32
-| wrapper: (SECItemType)35: c6 b0 93 d8  c7 2a 50 90  23 3a 10 21  1e 18 ce 7a  30 aa dc bc  c9 00 2e 35  78 9d 6c 6f  62 89 75 a5
-| CAVP: IKEv2 key derivation with HMAC-SHA1 extracted len 32 bytes at 0xaaaaf0d11ff0
+| wrapper: (SECItemType)35: 01 4a 80 69  52 78 9e 75  1e 04 6c 64  cd c7 f8 df  b5 50 c7 d8  24 1b 63 dc  c1 08 8b eb  39 89 7d 63
+| CAVP: IKEv2 key derivation with HMAC-SHA1 extracted len 32 bytes at 0xaaaad58a0ff0
 | unwrapped:
 |   a9 a7 b2 22  b5 9f 8f 48  64 5f 28 a1  db 5b 5f 5d   ..."...Hd_(..[_]
 |   74 79 cb a7  00 00 00 00  00 00 00 00  00 00 00 00   ty..............
@@ -12129,13 +12165,13 @@
 | NSS_IKE_PRF_PLUS_DERIVE:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 132-bytes
-|     base: base-key@0xaaaaf0d187a0 (20-bytes, NSS_IKE_PRF_PLUS_DERIVE)
-|     params: 40-bytes@0xffffef0fe780
-| CAVP: IKEv2 key derivation with HMAC-SHA1 extracting all 132 bytes of key@0xaaaaf0d15620
-| CAVP: IKEv2 key derivation with HMAC-SHA1: symkey-key@0xaaaaf0d15620 (132-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a77a0 (20-bytes, NSS_IKE_PRF_PLUS_DERIVE)
+|     params: 40-bytes@0xfffffe02ae60
+| CAVP: IKEv2 key derivation with HMAC-SHA1 extracting all 132 bytes of key@0xaaaad58a4620
+| CAVP: IKEv2 key derivation with HMAC-SHA1: symkey-key@0xaaaad58a4620 (132-bytes, EXTRACT_KEY_FROM_KEY)
 | sizeof bytes 144
-| wrapper: (SECItemType)35: 22 e9 db 54  3e 96 41 86  1b 40 af c9  f1 91 90 f9  e0 38 60 41  2d 64 5c 59  8d 9b 7d 02  d0 51 7e 0e  78 37 55 b7  d1 83 c3 c9  dd 46 75 f1  e6 c1 e1 75  77 db 32 23  ed 0b 89 46  81 07 da c7  05 0e 91 16  fc e3 8d 2e  33 77 b4 0d  d2 a6 4a 0b  43 ff 3d 33  8d 4d 14 bb  3f c7 af fe  d4 ea 22 d6  c3 8b 92 16  94 f0 6a 99  03 96 13 84  76 44 23 6b  09 b2 a9 62  8c 5a 58 be  03 e8 54 e7  14 e0 4f ff  43 3b 24 7e  89 a4 c0 70  24 83 0e 4d  3b 13 3c f7  81 29 3e bb
-| CAVP: IKEv2 key derivation with HMAC-SHA1 extracted len 144 bytes at 0xaaaaf0d144c0
+| wrapper: (SECItemType)35: 86 75 59 1f  91 e6 1a 40  62 f4 47 db  41 fb 6f cb  ea 42 b3 74  c8 ad f6 b8  e2 4e 35 41  56 3c 41 20  36 2a 25 52  bb 66 f9 13  5d 0c 0e d4  d1 19 f6 79  6e 6b 57 30  47 25 5f e3  bc 93 2f 4a  e8 73 e7 70  69 8e 1e 88  0e 18 1e cd  34 a0 47 91  6f 9a 19 4c  25 1c ae 5c  62 2d f6 9e  58 57 ba 09  47 15 bf 68  2a 51 84 2b  d6 b3 01 50  2b a8 1e 18  77 42 c9 45  d1 60 d6 49  e8 a3 14 bd  c4 50 fa a2  06 66 dd 57  71 6c b7 d1  b4 04 77 12  51 49 ec b4  5b f6 77 d7
+| CAVP: IKEv2 key derivation with HMAC-SHA1 extracted len 144 bytes at 0xaaaad58a34c0
 | unwrapped:
 |   a1 42 93 67  7c c8 0f f8  f9 cc 0e ee  30 d8 95 da   .B.g|.......0...
 |   9d 8f 40 56  66 e3 0e f0  df cb 63 c6  34 a4 60 02   ..@Vf.....c.4.`.
@@ -12151,29 +12187,29 @@
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 20-bytes
-|     base: base-key@0xaaaaf0d15620 (132-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a4620 (132-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe838
+|     params: 8-bytes@0xfffffe02af18
 | CONCATENATE_DATA_AND_BASE:
 |     target: EXTRACT_KEY_FROM_KEY
-|     base: base-key@0xaaaaf0d0e830 (16-bytes, AES_KEY_GEN)
-|     params: 16-bytes@0xffffef0fe810
+|     base: base-key@0xaaaad589d830 (16-bytes, AES_KEY_GEN)
+|     params: 16-bytes@0xfffffe02aef0
 |     key-offset: 0, key-size: 32
 | EXTRACT_KEY_FROM_KEY:
 |     target: EXTRACT_KEY_FROM_KEY
 |     key_size: 32-bytes
-|     base: base-key@0xaaaaf0d16ee0 (48-bytes, EXTRACT_KEY_FROM_KEY)
+|     base: base-key@0xaaaad58a5ee0 (48-bytes, EXTRACT_KEY_FROM_KEY)
 |     operation: FLAGS_ONLY
-|     params: 8-bytes@0xffffef0fe798
+|     params: 8-bytes@0xfffffe02ae78
 | NSS_IKE_PRF_DERIVE:
 |     target: NSS_IKE_PRF_PLUS_DERIVE
-|     base: base-key@0xaaaaf0d11ae0 (20-bytes, EXTRACT_KEY_FROM_KEY)
-|     params: 56-bytes@0xffffef0fe820
-| CAVP: IKEv2 key derivation with HMAC-SHA1 extracting all 20 bytes of key@0xaaaaf0d16ee0
-| CAVP: IKEv2 key derivation with HMAC-SHA1: symkey-key@0xaaaaf0d16ee0 (20-bytes, NSS_IKE_PRF_PLUS_DERIVE)
+|     base: base-key@0xaaaad58a0ae0 (20-bytes, EXTRACT_KEY_FROM_KEY)
+|     params: 56-bytes@0xfffffe02af00
+| CAVP: IKEv2 key derivation with HMAC-SHA1 extracting all 20 bytes of key@0xaaaad58a5ee0
+| CAVP: IKEv2 key derivation with HMAC-SHA1: symkey-key@0xaaaad58a5ee0 (20-bytes, NSS_IKE_PRF_PLUS_DERIVE)
 | sizeof bytes 32
-| wrapper: (SECItemType)-671103136: f7 f3 ae e4  04 73 05 40  3d 5c 3d 5f  87 2b b5 be  11 0e 16 32  12 11 ff 0e  9a 5d e8 04  c2 83 dc b4
-| CAVP: IKEv2 key derivation with HMAC-SHA1 extracted len 32 bytes at 0xaaaaf0d11ff0
+| wrapper: (SECItemType)-910375072: 39 fc a6 85  f7 87 16 89  7c da d6 5d  f0 1b a9 bd  4f eb 55 98  2a c8 e0 27  ff c4 1b d2  f4 e6 a4 3d
+| CAVP: IKEv2 key derivation with HMAC-SHA1 extracted len 32 bytes at 0xaaaad58a0ff0
 | unwrapped:
 |   63 e8 11 94  94 6e bd 05  df 7d f5 eb  f5 d8 75 00   c....n...}....u.
 |   56 bf 1f 1d  00 00 00 00  00 00 00 00  00 00 00 00   V...............
@@ -12182,12 +12218,12 @@
 algparse: leak detective found no leaks
 initializing NSS db
 running pluto selftest
-OBJ.linux.arm64/programs/pluto/pluto:  adjusting nssdir to /tmp/tmp.726jA95H20
+OBJ.linux.arm64/programs/pluto/pluto:  adjusting nssdir to /tmp/tmp.RgLY8VMOB7
 OBJ.linux.arm64/programs/pluto/pluto: pluto: warning: chdir("/run/pluto") to dumpdir failed (2: No such file or directory)
 OBJ.linux.arm64/programs/pluto/pluto: selftest: skipping lock
 OBJ.linux.arm64/programs/pluto/pluto: selftest: skipping control socket
 OBJ.linux.arm64/programs/pluto/pluto: selftest: skipping fork
-Initializing NSS using read-write database "sql:/tmp/tmp.726jA95H20"
+Initializing NSS using read-write database "sql:/tmp/tmp.RgLY8VMOB7"
 FIPS Mode: NO
 NSS crypto library initialized
 FIPS mode disabled for pluto daemon
@@ -12195,7 +12231,7 @@
 libcap-ng capng_apply failed to apply changes, err=-5. see: man capng_apply
 libcap-ng support [enabled]
 Linux audit support [enabled]
-Starting Pluto (Libreswan Version 4.14 IKEv2 IKEv1 XFRM XFRMI esp-hw-offload FORK PTHREAD_SETSCHEDPRIO NSS (IPsec profile) (NSS-KDF) DNSSEC LABELED_IPSEC (SELINUX) LIBCAP_NG LINUX_AUDIT AUTH_PAM NETWORKMANAGER CURL(non-NSS) LDAP(non-NSS)) pid:2534186
+Starting Pluto (Libreswan Version 4.14 IKEv2 IKEv1 XFRM XFRMI esp-hw-offload FORK PTHREAD_SETSCHEDPRIO NSS (IPsec profile) (NSS-KDF) DNSSEC LABELED_IPSEC (SELINUX) LIBCAP_NG LINUX_AUDIT AUTH_PAM NETWORKMANAGER CURL(non-NSS) LDAP(non-NSS)) pid:3640114
 core dump dir: /run/pluto
 secrets file: /etc/ipsec.secrets
 leak-detective disabled
@@ -12547,12 +12583,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/3612864/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/3612864/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/2513034 and its subdirectories
-I: Current time: Thu Dec 12 00:38:05 -12 2024
-I: pbuilder-time-stamp: 1734007085
+I: removing directory /srv/workspace/pbuilder/3612864 and its subdirectories
+I: Current time: Fri Dec 13 02:41:30 +14 2024
+I: pbuilder-time-stamp: 1734007290