Attachment 863750 Details for Bug 1046519 – patch for pkitool

[patch] patch for pkitool

pkitool.patch (text/plain), 1.50 KB, created by Harald Reindl on 2014-02-16 15:45:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Reindl

Created: 2014-02-16 15:45:36 UTC

Size: 1.50 KB

patch

obsolete

>--- pkitool-original	2014-02-16 16:38:42.751069362 +0100
>+++ pkitool-patched	2014-02-16 16:38:54.024087275 +0100
>@@ -322,7 +322,7 @@
> 
>     # Build root CA
>     if [ $DO_ROOT -eq 1 ]; then
>-	$OPENSSL req $BATCH -days $CA_EXPIRE $NODES_REQ -new -newkey rsa:$KEY_SIZE -sha1 \
>+	$OPENSSL req $BATCH -days $CA_EXPIRE $NODES_REQ -new -newkey rsa:$KEY_SIZE -$HASH_ALGO \
> 	    -x509 -keyout "$CA.key" -out "$CA.crt" -config "$KEY_CONFIG" && \
> 	    chmod 0600 "$CA.key"
>     else        
>@@ -347,7 +347,7 @@
> 		echo "Generating key pair on PKCS#11 token..."
> 		$PKCS11TOOL --module "$PKCS11_MODULE_PATH" --keypairgen \
> 			--login --pin "$PKCS11_PIN" \
>-			--key-type rsa:1024 \
>+			--key-type rsa:$KEY_SIZE \
> 			--slot "$PKCS11_SLOT" --id "$PKCS11_ID" --label "$PKCS11_LABEL" || exit 1
> 		PKCS11_ARGS="-engine pkcs11 -keyform engine -key $PKCS11_SLOT:$PKCS11_ID"
> 	fi
>@@ -356,7 +356,7 @@
> 	( [ $DO_REQ -eq 0 ] || $OPENSSL req $BATCH -days $KEY_EXPIRE $NODES_REQ -new -newkey rsa:$KEY_SIZE \
> 	        -keyout "$FN.key" -out "$FN.csr" $REQ_EXT -config "$KEY_CONFIG" $PKCS11_ARGS ) && \
> 	    ( [ $DO_CA -eq 0 ]  || $OPENSSL ca $BATCH -days $KEY_EXPIRE -out "$FN.crt" \
>-	        -in "$FN.csr" $CA_EXT -md sha1 -config "$KEY_CONFIG" ) && \
>+	        -in "$FN.csr" $CA_EXT -md $HASH_ALGO -config "$KEY_CONFIG" ) && \
> 	    ( [ $DO_P12 -eq 0 ] || $OPENSSL pkcs12 -export -inkey "$FN.key" \
> 	        -in "$FN.crt" -certfile "$CA.crt" -out "$FN.p12" $NODES_P12 ) && \
> 	    ( [ $DO_CA -eq 0 -o $DO_P11 -eq 1 ]  || chmod 0600 "$FN.key" ) && \

Actions: View | Diff

Attachments on bug 1046519: 863750