diff --git a/docs/A23.pdf b/docs/A23.pdf new file mode 100644 index 0000000..ef534ad Binary files /dev/null and b/docs/A23.pdf differ diff --git a/docs/PKSR20.pdf b/docs/PKSR20.pdf new file mode 100644 index 0000000..fa64cac Binary files /dev/null and b/docs/PKSR20.pdf differ diff --git a/docs/PKSR20.tex b/docs/PKSR20.tex index 3ddcce6..e87efa5 100644 --- a/docs/PKSR20.tex +++ b/docs/PKSR20.tex @@ -25,7 +25,7 @@ \newcommand{\answerbox}[1]{%% \fbox{\rule{#1in}{0pt}\rule[-0.5ex]{0pt}{4ex}}} - \title{\textbf{Application Form PKSR20}} + \title{\textbf{Additional Form PKSR20}} \author{c3gov} \date{Control no. \answerbox{1}} @@ -40,7 +40,7 @@ \maketitle \thispagestyle{empty} \section*{} -I hereby applicate to register my GPG fingerprint. +I hereby applicate to register my GPG fingerprint on my passport. I fullfil the requirement that I have either \begin{itemize} \item[1.] uploaded the public key to the \textbf{keys.openpgp.org} keyserver \textbf{using the following mail address} or diff --git a/docs/PrivacyPolicy.pdf b/docs/PrivacyPolicy.pdf new file mode 100644 index 0000000..ac9fe1d Binary files /dev/null and b/docs/PrivacyPolicy.pdf differ diff --git a/docs/PrivacyPolicy.tex b/docs/PrivacyPolicy.tex index c45f202..2bdf9bf 100644 --- a/docs/PrivacyPolicy.tex +++ b/docs/PrivacyPolicy.tex @@ -31,7 +31,7 @@ This office is compliant with the GDPR. \item The gathered information will not kept in the office after finishing the process. They will be always hand over to the applicant. If, how ever, the applicant fails to pick up their documents after the end of the running event, it \begin{itemize} \item will be kept save until the next event, - \item can be requested via mail + \item can be requested via the Chaos Computer Club Essen \end{itemize} \item The information requiring the usage of the computer are always saved volatilely for issuing the passport document. \end{itemize} diff --git a/docs/Y42.pdf b/docs/Y42.pdf new file mode 100644 index 0000000..a601372 Binary files /dev/null and b/docs/Y42.pdf differ diff --git a/docs/Y42.tex b/docs/Y42.tex index 365ebe9..013dd1d 100644 --- a/docs/Y42.tex +++ b/docs/Y42.tex @@ -49,17 +49,17 @@ The passport document has been \ \ \ \answerbox{0.1} already issued in a blank s \section*{Personal data} \ -Forename/Nick (max. 17 characters) +Forename/Nick (max. 25 characters) \\ \answerbox{6.5} \\ -Surname (max. 17 characters) [optional] +Surname (max. 25 characters) [optional] \\ \answerbox{6.5} \\ -Home(-hackerspace) (max. 17 characters) +Home(-hackerspace) (max. 25 characters) \\ \answerbox{6.5} \\ diff --git a/docs/c3govsticker.png b/docs/c3govsticker.png new file mode 100644 index 0000000..94c27fc Binary files /dev/null and b/docs/c3govsticker.png differ diff --git a/docs/de/A23_de.pdf b/docs/de/A23_de.pdf new file mode 100644 index 0000000..15766b5 Binary files /dev/null and b/docs/de/A23_de.pdf differ diff --git a/docs/de/A23_de.tex b/docs/de/A23_de.tex new file mode 100644 index 0000000..8ffbb5b --- /dev/null +++ b/docs/de/A23_de.tex @@ -0,0 +1,94 @@ +\documentclass[11pt,a4paper]{article} + \usepackage{amssymb} + \usepackage{amsmath} + \usepackage{geometry} + \geometry{ + a4paper, + total={170mm,287mm}, + left=20mm, + top=20mm, + } + + + + \usepackage{pgf} + + \pgfmathsetseed{\number\pdfrandomseed} % to ensure that it is randomized + % use \randomseed for xelatex + + \newcommand{\randomnum}[1]{% + \pgfmathsetmacro{\thenum}{int(random(ceil(#1-#1/4),floor(#1+#1/4)))}% + \thenum% + }% + + + \newcommand{\answerbox}[1]{%% + \fbox{\rule{#1in}{0pt}\rule[-0.5ex]{0pt}{4ex}}} + + \title{\textbf{Antragsformular A23}} + \author{c3gov} + \date{Kontrollnummer \randomnum{1000}} + + \addtolength{\topmargin}{-2cm} + + + + + +\begin{document} + +\maketitle +\thispagestyle{empty} +\section*{} +Hiermit beantrage ich mich als Hacker*in / Haeckse zu registrieren. +\\ +Ein Ausweis \ \ \ \answerbox{0.1} ist bereits im Blanko-Zustand vorhanden \ \ \ \answerbox{0.1} wurde noch nicht ausgestellt. + + +\section*{Persönliche Daten} +\ + +Vor- oder Nickname (max. 17 Zeichen) +\\ +\answerbox{6.5} +\\ + +Nachname (max. 17 Zeichen) - optional +\\ +\answerbox{6.5} +\\ + +Home(-hackspace) (max. 17 Zeichen) +\\ +\answerbox{6.5} +\\ + +\section*{Derzeitige Lebensumstände} +\subsection*{Chaos-Events} +Ich habe bisher \ \ \ \ \answerbox{0.1} ein \ \ \ \ \answerbox{0.1} zwei \ \ \ \ \answerbox{0.1} $\{\exists x \in \mathbb{N} \ |\ x > 2 \}$ \ \ \ Chaos-Events besucht. + +\subsection*{Das Chaos} +Ich weiß \ \ \ \answerbox{0.1} nichts$^{1)}$ \ \ \ \answerbox{0.1} etwas$^{2)}$ \ \ \ \answerbox{0.1} das Geheimnis$^{3)}$ \ \ \ \ vom Chaos. +\\ +\\ +Wenn $^{1)}$: \\ +Was fanden Sie bisher am interessantesten?\\ +\answerbox{6.5} +\\ +\\ +Wenn $^{2)}$: \\ +Haben Sie schon ein Home-Space gefunden?\\ +\answerbox{0.1} ja \ \ \ \ \answerbox{0.1} nein +\\ +\\ +Wenn $^{3)}$: \\ +Bitte vervollständigen Sie: Das geht nicht in \answerbox{3.5}. +\\ + +\section*{Hinweis} +\begin{itemize} +\item Um Ihren \textbf{GPG-Fingerabdruck} auf Ihren Passport mitzuregistrieren, bitte \textbf{Formular PKSR20} ausfüllen. +\end{itemize} + +\end{document} + diff --git a/docs/de/PKSR20_de.pdf b/docs/de/PKSR20_de.pdf new file mode 100644 index 0000000..7b0daa7 Binary files /dev/null and b/docs/de/PKSR20_de.pdf differ diff --git a/docs/de/PKSR20_de.tex b/docs/de/PKSR20_de.tex new file mode 100644 index 0000000..3439ac5 --- /dev/null +++ b/docs/de/PKSR20_de.tex @@ -0,0 +1,93 @@ +\documentclass[11pt,a4paper]{article} + \usepackage{amssymb} + \usepackage{amsmath} + \usepackage{geometry} + \geometry{ + a4paper, + total={170mm,257mm}, + left=20mm, + top=20mm, + } + + + + \usepackage{pgf} + + \pgfmathsetseed{\number\pdfrandomseed} % to ensure that it is randomized + % use \randomseed for xelatex + + \newcommand{\randomnum}[1]{% + \pgfmathsetmacro{\thenum}{int(random(ceil(#1-#1/4),floor(#1+#1/4)))}% + \thenum% + }% + + + \newcommand{\answerbox}[1]{%% + \fbox{\rule{#1in}{0pt}\rule[-0.5ex]{0pt}{4ex}}} + + \title{\textbf{Zusatzformular PKSR20}} + \author{c3gov} + \date{Kontrollnummer \answerbox{1}} + + \addtolength{\topmargin}{-2cm} + + + + + +\begin{document} + +\maketitle +\thispagestyle{empty} +\section*{} +Hiermit beantrage ich meinen GPG-Fingerabdruck auf meinem Passport eintragen zu lassen. +Ich erfülle die Voraussetzung, dass ich entweder +\begin{itemize} +\item[1.] den öffentlichen Schlüssel auf den Schlüsselserver von \textbf{keys.openpgp.org} unter \textbf{folgender E-Mail-Adresse hochgeladen habe} oder +\item[2.] ich den \textbf{gesamten GPG-Fingerabdruck} angeben kann, und zwar +\end{itemize} +\ +E-Mail-Adresse oder gesamter GPG-Fingerabdruck\\ +(z.B. 1234-2234-3234-4234-5234-6234-7234-8234-9234-0234) +\\ +\answerbox{6.5} +\\ +\\ +Ich versichere, dass ich die oben angegebenen Voraussetzungen erfülle und überprüft habe, dass jene Voraussetzung auch während des Registrierungs- und Ausstellungsprozesses gegeben sind. + + +\section*{Zusätzliche Angaben} +Folgende Farbe ist auf den GPG-Fingerabdruck anwendbar: +\\ +Fingerabdruck-Farbe +\\ +\answerbox{6.5} +\\ +\\ +Bitte Auswahl in einem Satz begründen. +\\ +\answerbox{6.5} +\\ +\\ +\\ +Von einer Skala von 1 (auf keinen Fall) bis 5 (auf jeden Fall), wie privat ist Ihr öffentlicher Schlüssel? +\\ +\\ +\answerbox{0.1} 1 \ \ \ \answerbox{0.1} 2 \ \ \ \answerbox{0.1} 3 \ \ \ \answerbox{0.1} 4 \ \ \ \answerbox{0.1} 5 \ \ \ +\\ +\\ +\\ +Von einer Skala von 1 (auf keinen Fall) bis 5 (auf jeden Fall), wie privat ist Ihr privater Schlüssel? +\\ +\\ +\answerbox{0.1} 1 \ \ \ \answerbox{0.1} 2 \ \ \ \answerbox{0.1} 3 \ \ \ \answerbox{0.1} 4 \ \ \ \answerbox{0.1} 5 \ \ \ +\\ +\\ +\\ +Von einer Skala von 1 (auf keinen Fall) bis 5 (auf jeden Fall), wie öffentlich ist Ihr öffentlicher Schlüssel? +\\ +\\ +\answerbox{0.1} 1 \ \ \ \answerbox{0.1} 2 \ \ \ \answerbox{0.1} 3 \ \ \ \answerbox{0.1} 4 \ \ \ \answerbox{0.1} 5 \ \ \ + +\end{document} + diff --git a/docs/de/Y42_de.pdf b/docs/de/Y42_de.pdf new file mode 100644 index 0000000..0bde1d1 Binary files /dev/null and b/docs/de/Y42_de.pdf differ diff --git a/docs/de/Y42_de.tex b/docs/de/Y42_de.tex new file mode 100644 index 0000000..a75535b --- /dev/null +++ b/docs/de/Y42_de.tex @@ -0,0 +1,86 @@ +\documentclass[11pt,a4paper]{article} + \usepackage{amssymb} + \usepackage{amsmath} + \usepackage{geometry} + \geometry{ + a4paper, + total={170mm,257mm}, + left=20mm, + top=20mm, + } + + + + \usepackage{pgf} + + \pgfmathsetseed{\number\pdfrandomseed} % to ensure that it is randomized + % use \randomseed for xelatex + + \newcommand{\randomnum}[1]{% + \pgfmathsetmacro{\thenum}{int(random(ceil(#1-#1/4),floor(#1+#1/4)))}% + \thenum% + }% + + + \newcommand{\answerbox}[1]{%% + \fbox{\rule{#1in}{0pt}\rule[-0.5ex]{0pt}{4ex}}} + + \title{\textbf{Antragsformular Y42}} + \author{c3gov} + \date{Kontrollnummer \randomnum{1000}} + + \addtolength{\topmargin}{-1cm} + \addtolength{\textheight}{1cm} + + + + +\begin{document} + +\maketitle +\thispagestyle{empty} + +\section*{} +Hiermit beantrage ich mich als Hacker*in / Haeckse zu registrieren. +\\ +Ein Ausweis \ \ \ \answerbox{0.1} ist bereits im Blanko-Zustand vorhanden \ \ \ \answerbox{0.1} wurde noch nicht ausgestellt. + + +\section*{Persönliche Daten} +\ + +Vor- oder Nickname (max. 25 Zeichen) +\\ +\answerbox{6.5} +\\ + +Nachname (max. 25 characters) [optional] +\\ +\answerbox{6.5} +\\ + +Home(-hackspace) (max. 25 characters) +\\ +\answerbox{6.5} +\\ + +\section*{Derzeitige Lebensumstände} +\subsection*{Chaos-Events} +Ich habe bisher \ \ \ \ \answerbox{0.1} ein \ \ \ \ \answerbox{0.1} zwei \ \ \ \ \answerbox{0.1} $\{\exists x \in \mathbb{N} \ |\ x > 2 \}$ \ \ \ Chaos-Events besucht. + +\subsection*{Das Chaos} +Ich weiß \ \ \ \answerbox{0.1} nichts$^{1)}$ \ \ \ \answerbox{0.1} etwas$^{2)}$ \ \ \ \answerbox{0.1} das Geheimnis$^{3)}$ \ \ \ \ vom Chaos. +\\ +\\ +$^{1)}$Bitte Formular R21 ausfüllen \\ +$^{2)}$Bitte Formular R22 ausfüllen \\ +$^{3)}$Bitte Formular R23 ausfüllen \\ +\section*{Hinweis} +\begin{itemize} + \item Um Ihren \textbf{GPG-Fingerabdruck} auf Ihren Passport mitzuregistrieren, bitte \textbf{Formular PKSR20} ausfüllen. +\end{itemize} + +\end{document} + + + diff --git a/jhp/secure b/jhp/secure new file mode 100755 index 0000000..050b303 --- /dev/null +++ b/jhp/secure @@ -0,0 +1,40 @@ +#!/bin/bash +FILE=/tmp/$RANDOM +TOP=5 +TOP=13 +TOP2=51 +LEFT=23 + +VISAPAGES=2 + + +if [ $# -eq 0 ]; then + echo "Syntax: $0 " + exit 1 +fi + +sn=$1 + +source ../include/nixdorf +init + +smallLetters $FILE +printf "\x1b\x33\x0e" >> $FILE +makeNewline $TOP $FILE +makeLeft $LEFT $FILE + +printf "$sn" >> $FILE + +makeNewline $(($TOP2 - $TOP)) $FILE +makeLeft $LEFT $FILE +printf "$sn" >> $FILE +resetLetters $FILE + +echo "Only use the pages saying \"VISAs\" on top" +for (( i=1; i<=$VISAPAGES; i++)); do + read -s -p "Insert page $i of $VISAPAGES and press enter." + echo "" + printFile $FILE +done + +rm $FILE diff --git a/stapleddipl/secure b/stapleddipl/secure index 625f00b..28165f0 100755 --- a/stapleddipl/secure +++ b/stapleddipl/secure @@ -1,12 +1,12 @@ #!/bin/bash FILE=/tmp/$RANDOM -TOP=1 -LEFT=5 +TOP=0 +LEFT=3 -VISAPAGES=1 +VISAPAGES=6 # GPG Space -NEXTPAGE=34 +NEXTPAGE=28 NEXTPAGESMALL=60 NEXTFIELDBOTTOM=13 NEXTFIELDRIGHT=18 @@ -25,13 +25,16 @@ init makeNewline $TOP $FILE makeLeft $LEFT $FILE +italicLetters $FILE printf "$sn" >> $FILE makeLeft $NEXTPAGE $FILE printf "$sn" >> $FILE +resetLetters $FILE echo "Only use the pages saying \"VISAs\" on top" for (( i=1; i<=$VISAPAGES; i++)); do - echo -e "Insert page $i of $VISAPAGES\n" + read -s -p "Insert page $i of $VISAPAGES and press enter." + echo "" printFile $FILE done diff --git a/stapleddipl/secure_firstpage b/stapleddipl/secure_firstpage new file mode 100755 index 0000000..4269995 --- /dev/null +++ b/stapleddipl/secure_firstpage @@ -0,0 +1,34 @@ +#!/bin/bash +FILE=/tmp/$RANDOM +TOP=50 +NEXTFIELD=5 +LEFT=38 +MAXLENGTH=6 + +GIVENNAME=$1 +SURNAME=$2 +HOME=$3 + + +if [ $# -eq 0 ]; then + echo "Syntax: $0 " + exit 1 +fi + +sn=$1 + +if [ ${#sn} -gt $MAXLENGTH ]; then + echo "Security Number too long" + exit 1 +fi + +source ../include/nixdorf +init +smallLetters $FILE +printf "\x1b\x33\x0e" >> $FILE +makeNewline $TOP $FILE +makeLeft $LEFT $FILE +printf "$1" >> $FILE + +printFile $FILE +rm $FILE diff --git a/start_dialog b/start_dialog index 526f477..f2f199d 100755 --- a/start_dialog +++ b/start_dialog @@ -356,6 +356,16 @@ function enterSecurityCode() { } +function printSecurePassportFirstPage(){ + checkLockFile + diaBox "Insert Passport" "Pleast insert the FIRST PAGE (Identity) into the printer." + + cd "$1" + ./secure_firstpage "$SECURITYCODE" + cd .. + rm $LOCKFILE +} + function printSecurePassport(){ checkLockFile diaBox "Insert Passport" "Please insert passport (Visas) into the printer.\nA print on EVERY Visa page is necessary." @@ -396,12 +406,24 @@ function menuFor() { printGPG "$1" fi ;; - 4) enterSecurityCode - if [ $? -eq 0 ]; then - printSecurePassport "$1" + 8) if [ "$1" = "bounddipl" ]; then + diaBox "Error" "Passport not supported." + else + enterSecurityCode + if [ $? -eq 0 ]; then + case $1 in + "bounddipl") + ;; + "jhp") + printSecurePassport "$1" + ;; + *) + printSecurePassportFirstPage "$1" + printSecurePassport "$1" + ;; + esac + fi fi - ;; - esac unset FNAME unset SNAME