From 5c900a71dc1eb88b378c85fa90882259a0317cc9 Mon Sep 17 00:00:00 2001 From: Frank Morgner Date: Sat, 9 Feb 2013 23:43:45 +0100 Subject: [PATCH] distributing nPA's default trust anchors --- npa/Makefile.am | 2 +- npa/certs/Makefile.am | 8 ++++ npa/certs/at_cert_19a.cvcert | Bin 0 -> 367 bytes npa/certs/at_cert_19a_ecdh.cvcert | Bin 0 -> 363 bytes .../csca-germany_013_self_signed_cer.cer | Bin 0 -> 899 bytes npa/certs/cvca-eid.cv | Bin 0 -> 443 bytes npa/certs/dv_cert_19.cvcert | Bin 0 -> 369 bytes npa/certs/dv_cert_19_ecdh.cvcert | Bin 0 -> 363 bytes npa/configure.ac | 40 +++++++++++++++++- 9 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 npa/certs/Makefile.am create mode 100644 npa/certs/at_cert_19a.cvcert create mode 100644 npa/certs/at_cert_19a_ecdh.cvcert create mode 100644 npa/certs/csca-germany_013_self_signed_cer.cer create mode 100644 npa/certs/cvca-eid.cv create mode 100644 npa/certs/dv_cert_19.cvcert create mode 100644 npa/certs/dv_cert_19_ecdh.cvcert diff --git a/npa/Makefile.am b/npa/Makefile.am index 6628066..2994f82 100644 --- a/npa/Makefile.am +++ b/npa/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src m4 doc win32 +SUBDIRS = src m4 doc win32 certs EXTRA_DIST = libnpa.pc.in apdus test_vicc_with_npa-tool.sh diff --git a/npa/certs/Makefile.am b/npa/certs/Makefile.am new file mode 100644 index 0000000..415e255 --- /dev/null +++ b/npa/certs/Makefile.am @@ -0,0 +1,8 @@ +CV_CERTS = at_cert_19a.cvcert at_cert_19a_ecdh.cvcert cvca-eid.cv dv_cert_19.cvcert dv_cert_19_ecdh.cvcert +X509_CERTS = csca-germany_013_self_signed_cer.cer + +EXTRA_DIST = $(CV_CERTS) $(X509_CERTS) + +install-data-local: + for cert in $(X509_CERTS); do $(INSTALL_DATA) $(srcdir)/$${cert} "$(X509DIR)"; done + for cert in $(CV_CERTS); do $(INSTALL_DATA) $(srcdir)/$${cert} "$(CVCDIR)"; done diff --git a/npa/certs/at_cert_19a.cvcert b/npa/certs/at_cert_19a.cvcert new file mode 100644 index 0000000000000000000000000000000000000000..d31ff4299848bd32ea4b8828a05fbaf1e98bcd4a GIT binary patch literal 367 zcmbZ#OvZ3;u;*{66WG+U}#zI**Jxbi-n<{ft`toiIK6fv0;AQ zw?0wZEq?`C?!Mi(u0^ih0~y?|pLcxoid}zxXA?6c17o}b)SZqY5O?|rv2lW($;`;a z6wJ!Nz`!UFugb>Az`)GJ60ZVcumBn6jSW2;6V(>}-QDDIqWiY|M#(w$sup4Y1e)Wk z|0gZxzSOv5;fH_BjY~HyQ49QD`&}_e@x$9E9nU&nxt@E(EqQ$7#kbqmD1LV6Xq=ya z^^UP2=ffz```=m@ZJR58^^xuR$H^<6CmWto-6{M#?}ou^*QyK4il;4{aO&}#V~3uk L%OwO|KBNl(#ZsRy literal 0 HcmV?d00001 diff --git a/npa/certs/at_cert_19a_ecdh.cvcert b/npa/certs/at_cert_19a_ecdh.cvcert new file mode 100644 index 0000000000000000000000000000000000000000..16733207ffb8d8391d4778175c9801cd4a991ab2 GIT binary patch literal 363 zcmbZ#OvZ3;u;*{66WG+U}#zI**JlXi-n<{ft?8mSlb#KS&Un^ zw7hsZ<)nS++Ak|l>MlNzyr#Cquk~`@gM$6}Kd!G{bT6Y_Wm9eTI&GP*2PFq)?`Y^b zVPLi)Q)5PuZ%+=a(GK4`)6XmG_TJEzkMz zcPZ(*HwjOVeQ4!9a@jRLSVL$2o)xht-7i|di&ucU(J=(#Mjs(IPOuZ18JU=ZSs54@ z7zN^0*%%oZIGGvZRe%ge1|Y+{vB6|_j|Nv&q|Nu^FF%+5|G)pHj-P#E#}W?}#W=zD z?iWln&YzStTa+-TMDM3gWX7In(Mz=6R;?}AzG<-#;~i0*Hx}Y->|WRJ;lUm(D;Cfk-vwv!fm}boPhv%}-+>!X-!@iBh zk)`|6x}B%%!cXgXd+7gZ+`fM2J@to=_bMNzq+iNZk+9!?%w7o&Lj3N+ePC zc9FY#d7}o&S3M*|BOCuu- zOH&IYb0Z@IK9D|sM#ldvz=XueW*`gV^RbArh$Ogta{ct6@XFPcFHg&_nPuL7EfHxT z50X}9kuVTzz^=d%q(Fhi3Yd7z*f?1j>KWLX8G#Y0X`s%=q0Pp~%F52fC?=gzQc_^0 zuU}qXu7~76eUQrygg{0JgPg=+zy_q47#R$-L1F?dDh5go{6+>SDYFqMU}y+Vs?fBF zk~Ns!84O&Q6r?N*m8zz#dOj(lYv~Kx|mnCj_bU|?uqRPWiuD9gsh!cfn^&IAO^jS4G& zhu>cKZsi`kG_DDAn|q7$tiLH=Ra4MV5cZIj&kHVZQmBpMEd8Tn5dQ94sexnF|L4CO zLJz9liOG5CVC&6h1!Ugt>oxnQwuouQe1CW@`^+7Q|2^#6S{zxrFRj~ox-R^* zj<<*YpT_O$civNf_;|1KAuE^Qy|d04C56=eFg<+h$lvKd+@wSjWltU|cNNxs+ZPfe z8**HqC3AW!xHrnLoAMD*6J2 zk7oPKNz$o&YcufoR23}%=+1f+|^WSn{##2>xcL;T~Z zInI%`TT|GME#AO(`txUz=O(kx^Bmj%`t-fO0$c8U_+)r1YFfcKHNr8|C3IqUu00#mB0s;kw zfq?`HbeArKx6;HY`{Zpv$t`TPYUZS{uUm`2l73$H_c9=NZ82#+Hr9pTZ1Z+LL2`|j zeZiJLe5Vf%r>(W>g>8xxJBE9X^b;yC)A{m>LBR6hY*h&T@k(7ZK7mM`U zY!2t5HNV5uMUjKl2qP-Tfya#X#ZE8tTcs9XAPq!CR7F!%L{>yaFfloQOcDkO1OR^k z2Lk~D0#gNmAOHUlUnK?s000RC0AC~q0RRC20{~w)fq$*SWA J&#s!*v6R<5m8<{& literal 0 HcmV?d00001 diff --git a/npa/configure.ac b/npa/configure.ac index c14c26b..46799b1 100644 --- a/npa/configure.ac +++ b/npa/configure.ac @@ -47,7 +47,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) # Checks for libraries. -test -z "$OPENSC_LIBS" && OPENSC_LIBS="-lopensc" +test -z "$OPENSC_LIBS" && OPENSC_LIBS="-lopensc -lcrypto" test -z "$OPENSC_CFLAGS" && OPENSC_CFLAGS="-I${PWD}/${srcdir}/src/opensc/src -DENABLE_SM" saved_CPPFLAGS="$CPPFLAGS" @@ -106,6 +106,41 @@ CPPFLAGS="$saved_CPPFLAGS" LIBS="$saved_LIBS" +AC_ARG_ENABLE(cvcdir, + AC_HELP_STRING([--enable-cvcdir=DIR], + [directory containing CV certificates (default is determined by libeac)]), + [cvcdir="${enableval}"], + [cvcdir=false]) +if test "${cvcdir}" = false ; then + cvcdir="`$PKG_CONFIG libeac --variable=cvcdir`" +fi +if test "${cvcdir}" = "" ; then + AC_MSG_ERROR([use --enable-cvcdir=DIR]) +fi +CVCDIR="${cvcdir}" +AC_SUBST(CVCDIR) + +AC_ARG_ENABLE(x509dir, + AC_HELP_STRING([--enable-x509dir=DIR], + [directory containing X.509 certificates (default is determined by libeac)]), + [x509dir="${enableval}"], + [x509dir=false]) +if test "${x509dir}" = false ; then + x509dir="`$PKG_CONFIG libeac --variable=x509dir`" +fi +if test -z "${x509dir}" +then + x509dir="`$PKG_CONFIG libeac --variable=x509dir`" +fi +if test -z "${x509dir}" +then + AC_MSG_ERROR([use --enable-x509dir=DIR]) +fi +X509DIR="${x509dir}" +AC_SUBST(X509DIR) + + + # Checks for header files. AC_CHECK_HEADERS([arpa/inet.h fcntl.h memory.h stdint.h stdlib.h string.h sys/ioctl.h unistd.h]) @@ -155,9 +190,10 @@ EOF AC_CONFIG_FILES([ Makefile + certs/Makefile + doc/Makefile m4/Makefile src/Makefile win32/Makefile - doc/Makefile ]) AC_OUTPUT