Skip to content

Commit 8b652e7

Browse files
jernejsjernejs
committed
More fixes for variables with ) in them
1 parent 7dc2b5c commit 8b652e7

File tree

1 file changed

+57
-52
lines changed

1 file changed

+57
-52
lines changed

‎easy-rsa/Windows 2.0/pkitool.cmd

Lines changed: 57 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -203,37 +203,37 @@ if [%1]==[] (
203203
set PKCS11_MODULE_PATH=%2
204204
set PKCS11_SLOT=%3
205205
set PKCS11_LABEL=%4
206-
if "%PKCS11_LABEL%"=="" (
206+
if "!PKCS11_LABEL!"=="" (
207207
echo Please specify library name, slot and label >&2
208208
exit /b 1
209209
)
210210

211-
"%PKCS11TOOL%" --module "%PKCS11_MODULE_PATH%" --init-token --slot "%PKCS11_SLOT%" ^
212-
--label "%PKCS11_LABEL%" && ^
213-
"%PKCS11TOOL%" --module "%PKCS11_MODULE_PATH%" --init-pin --slot "%PKCS11_SLOT%"
211+
"!PKCS11TOOL!" --module "!PKCS11_MODULE_PATH!" --init-token --slot "!PKCS11_SLOT!" ^
212+
--label "!PKCS11_LABEL!" && ^
213+
"!PKCS11TOOL!" --module "!PKCS11_MODULE_PATH!" --init-pin --slot "!PKCS11_SLOT!"
214214

215-
exit /b %ERRORLEVEL%
215+
exit /b !ERRORLEVEL!
216216
)
217217
if "%1"=="--pkcs11-slots" (
218218
set PKCS11_MODULE_PATH=%2
219-
if "%PKCS11_MODULE_PATH%"=="" (
219+
if "!PKCS11_MODULE_PATH!"=="" (
220220
echo Please specify library name >&2
221221
exit /b 1
222222
)
223223

224-
"%PKCS11TOOL%" --module "%PKCS11_MODULE_PATH%" --list-slots
224+
"!PKCS11TOOL!" --module "!PKCS11_MODULE_PATH!" --list-slots
225225

226226
exit /b 0
227227
)
228228
if "%1"=="--pkcs11-objects" (
229229
set PKCS11_MODULE_PATH=%2
230230
set PKCS11_SLOT=%3
231-
if "%PKCS11_SLOT%"=="" (
231+
if "!PKCS11_SLOT!"=="" (
232232
echo Please specify library name and slot >&2
233233
exit /b 1
234234
)
235235

236-
"%PKCS11TOOL%" --module "%PKCS11_MODULE_PATH%" --list-objects --login --slot "%PKCS11_SLOT%"
236+
"!PKCS11TOOL!" --module "!PKCS11_MODULE_PATH!" --list-objects --login --slot "!PKCS11_SLOT!"
237237
exit /b 0
238238
)
239239

@@ -253,7 +253,7 @@ if [%1]==[] (
253253
:: errors
254254
if "%PARAMOK%"=="0" (
255255
set P=%1
256-
if "%P:~0,2%"=="--" (
256+
if "!P:~0,2!"=="--" (
257257
echo %PROGNAME%: unknown option: %1 >&2
258258
exit /b 1
259259
) else (
@@ -268,7 +268,7 @@ if not [%1]==[] goto paramloop
268268

269269
if not "%BATCH%"=="" (
270270
(
271-
for /f "tokens=2" %%v in ('"%OPENSSL%" version') do set OPENSSL_VER=%%v
271+
for /f "tokens=2" %%v in ('"!OPENSSL!" version') do set OPENSSL_VER=%%v
272272
) 2>nul
273273

274274
if "!OPENSSL_VER:~0,3!"=="0.9" if /I "!OPENSSL_VER:~4,1!" LSS 7 (
@@ -283,12 +283,14 @@ if "%DO_P12%"=="1" if "%DO_P11%"=="1" (
283283
)
284284

285285
if "%DO_P11%"=="1" (
286-
findstr "^pkcs11.*=" "%KEY_CONFIG%" >nul
286+
findstr "^pkcs11.*=" "!KEY_CONFIG!" >nul
287287
if errorlevel 1 (
288-
echo Please edit %KEY_CONFIG% and setup PKCS#11 engine >&2
288+
echo Please edit !KEY_CONFIG! and setup PKCS#11 engine >&2
289289
exit /b 1
290290
)
291291
)
292+
:: -config sometimes doesn't work
293+
set OPENSSL_CONF=%KEY_CONFIG%
292294

293295
:: If we are generating pkcs12, only encrypt the final step
294296
if "%DO_P12%"=="1" (
@@ -297,7 +299,7 @@ if "%DO_P12%"=="1" (
297299
)
298300

299301
if "%DO_P11%"=="1" (
300-
if "%PKCS11_LABEL%"=="" (
302+
if "!PKCS11_LABEL!"=="" (
301303
echo PKCS#11 arguments incomplete >&2
302304
exit /b 1
303305
)
@@ -349,25 +351,25 @@ if "%HOW%"=="0" (
349351

350352
:: Show parameters (debugging)
351353
if "%DEBUG%"=="1" (
352-
echo DO_REQ %DO_REQ%
353-
echo REQ_EXT %REQ_EXT%
354-
echo DO_CA %DO_CA%
355-
echo CA_EXT %CA_EXT%
356-
echo NODES_REQ %NODES_REQ%
357-
echo NODES_P12 %NODES_P12%
358-
echo DO_P12 %DO_P12%
359-
echo KEY_CN %KEY_CN%
360-
echo BATCH %BATCH%
361-
echo DO_ROOT %DO_ROOT%
362-
echo KEY_EXPIRE %KEY_EXPIRE%
363-
echo CA_EXPIRE %CA_EXPIRE%
364-
echo KEY_OU %KEY_OU%
365-
echo KEY_NAME %KEY_NAME%
366-
echo DO_P11 %DO_P11%
367-
echo PKCS11_MODULE_PATH %PKCS11_MODULE_PATH%
368-
echo PKCS11_SLOT %PKCS11_SLOT%
369-
echo PKCS11_ID %PKCS11_ID%
370-
echo PKCS11_LABEL %PKCS11_LABEL%
354+
echo DO_REQ !DO_REQ!
355+
echo REQ_EXT !REQ_EXT!
356+
echo DO_CA !DO_CA!
357+
echo CA_EXT !CA_EXT!
358+
echo NODES_REQ !NODES_REQ!
359+
echo NODES_P12 !NODES_P12!
360+
echo DO_P12 !DO_P12!
361+
echo KEY_CN !KEY_CN!
362+
echo BATCH !BATCH!
363+
echo DO_ROOT !DO_ROOT!
364+
echo KEY_EXPIRE !KEY_EXPIRE!
365+
echo CA_EXPIRE !CA_EXPIRE!
366+
echo KEY_OU !KEY_OU!
367+
echo KEY_NAME !KEY_NAME!
368+
echo DO_P11 !DO_P11!
369+
echo PKCS11_MODULE_PATH !PKCS11_MODULE_PATH!
370+
echo PKCS11_SLOT !PKCS11_SLOT!
371+
echo PKCS11_ID !PKCS11_ID!
372+
echo PKCS11_LABEL !PKCS11_LABEL!
371373
)
372374

373375
:: Make sure ./vars was sourced beforehand
@@ -391,16 +393,16 @@ cd /D "%KEY_DIR%"
391393
findstr /r /c:"easy-rsa version 2\.[0-9]" "%KEY_CONFIG%" > nul
392394
if errorlevel 1 (
393395
echo %PROGNAME%: KEY_CONFIG (set by the vars.cmd script^) is pointing to the wrong
394-
echo version of openssl.cnf: %KEY_CONFIG%
396+
echo version of openssl.cnf: !KEY_CONFIG!
395397
echo The correct version should have a comment that says: easy-rsa version 2.x
396398
exit /b 1
397399
)
398400

399401
:: Build root CA
400402
if "%DO_ROOT%"=="1" (
401403

402-
"%OPENSSL%" req %BATCH% -days %CA_EXPIRE% %NODES_REQ% -new -newkey rsa:%KEY_SIZE% -sha1 ^
403-
-x509 -keyout "%CA%.key" -out "%CA%.crt" -config "%KEY_CONFIG%"
404+
"!OPENSSL!" req !BATCH! -days !CA_EXPIRE! !NODES_REQ! -new -newkey rsa:!KEY_SIZE! -sha1 ^
405+
-x509 -keyout "!CA!.key" -out "!CA!.crt" -config "!KEY_CONFIG!"
404406

405407
) else (
406408
:: Make sure CA key/cert is available
@@ -409,10 +411,10 @@ if "%DO_ROOT%"=="1" (
409411
if "%DO_P12%"=="1" set ISCA=1
410412
if "!ISCA!"=="1" (
411413
set ISCERT=0
412-
if not exist "%CA%.crt" set ISCERT=1
413-
if not exist "%CA%.key" set ISCERT=1
414+
if not exist "!CA!.crt" set ISCERT=1
415+
if not exist "!CA!.key" set ISCERT=1
414416
if "!ISCERT!"=="1" (
415-
echo %PROGNAME%: Need a readable %CA%.crt and %CA%.key in %KEY_DIR%
417+
echo %PROGNAME%: Need a readable !CA!.crt and !CA!.key in !KEY_DIR!
416418
echo Try %PROGNAME% --initca to build a root certificate/key.
417419
exit /b 1
418420
)
@@ -425,34 +427,37 @@ if "%DO_ROOT%"=="1" (
425427
set /p PKCS11_PIN=User pin:
426428

427429
echo Generating key pair on PKCS#11 token...
428-
"%PKCS11TOOL%" --module "%PKCS11_MODULE_PATH%" --keypairgen ^
430+
"!PKCS11TOOL!" --module "!PKCS11_MODULE_PATH!" --keypairgen ^
429431
--login --pin "!PKCS11_PIN!" ^
430432
--key-type rsa:1024 ^
431-
--slot "%PKCS11_SLOT%" --id "%PKCS11_ID%" --label "%PKCS11_LABEL%" || exit /b 1
432-
set PKCS11_ARGS=-engine pkcs11 -keyform engine -key %PKCS11_SLOT%:%PKCS11_ID%
433+
--slot "!PKCS11_SLOT!" --id "!PKCS11_ID!" --label "!PKCS11_LABEL!" || exit /b 1
434+
set PKCS11_ARGS=-engine pkcs11 -keyform engine -key !PKCS11_SLOT!:!PKCS11_ID!
433435
)
434436

435437
:: Build cert/key
436438
if not "%DO_REQ%"=="0" (
437-
"%OPENSSL%" req %BATCH% -days "%KEY_EXPIRE%" %NODES_REQ% -new -newkey rsa:%KEY_SIZE% ^
438-
-keyout "%FN%.key" -out "%FN%.csr" %REQ_EXT% -config "%KEY_CONFIG%" !PKCS11_ARGS!
439+
440+
"!OPENSSL!" req %BATCH% -days "!KEY_EXPIRE!" %NODES_REQ% -new -newkey rsa:!KEY_SIZE! ^
441+
-keyout "!FN!.key" -out "!FN!.csr" !REQ_EXT! -config "!KEY_CONFIG!" !PKCS11_ARGS!
439442
)
440443
if not errorlevel 1 if not "%DO_CA%"=="0" (
441-
"%OPENSSL%" ca %BATCH% -days "%KEY_EXPIRE%" -out "%FN%.crt" ^
442-
-in "%FN%.csr" %CA_EXT% -md sha1 -config "%KEY_CONFIG%"
444+
445+
"!OPENSSL!" ca %BATCH% -days "!KEY_EXPIRE!" -out "!FN!.crt" ^
446+
-in "!FN!.csr" !CA_EXT! -md sha1 -config "!KEY_CONFIG!"
443447
)
444448
if not errorlevel 1 if not "%DO_P12%"=="0" (
445-
"%OPENSSL%" pkcs12 -export -inkey "%FN%.key" \
446-
-in "%FN%.crt" -certfile "%CA%.crt" -out "%FN%.p12" %NODES_P12%
449+
450+
"!OPENSSL!" pkcs12 -export -inkey "%FN%.key" \
451+
-in "!FN!.crt" -certfile "!CA!.crt" -out "!FN!.p12" %NODES_P12%
447452
)
448453

449454
:: Load certificate into PKCS#11 token
450455
if "%DO_P11%"=="1" (
451-
"%OPENSSL%" x509 -in "%FN%.crt" -inform PEM -out "%FN%.crt.der" -outform DER && ^
452-
"%PKCS11TOOL%" --module "%PKCS11_MODULE_PATH%" --write-object "%FN%.crt.der" --type cert ^
456+
"!OPENSSL!" x509 -in "!FN!.crt" -inform PEM -out "!FN!.crt.der" -outform DER && ^
457+
"!PKCS11TOOL!" --module "!PKCS11_MODULE_PATH!" --write-object "!FN!.crt.der" --type cert ^
453458
--login --pin "!PKCS11_PIN!" \
454-
--slot "%PKCS11_SLOT%" --id "%PKCS11_ID%" --label "%PKCS11_LABEL%"
459+
--slot "!PKCS11_SLOT!" --id "!PKCS11_ID!" --label "!PKCS11_LABEL!"
455460

456-
if exist "%FN%.crt.der" del "%FN%.crt.der"
461+
if exist "!FN!.crt.der" del "!FN!.crt.der"
457462
)
458463
)

0 commit comments

Comments
 (0)