Skip to content

Commit 03edaef

Browse files
authored
Merge pull request #204 from sebastian-carpenter/wolfclu-manual-review
updated WolfCLU-Manual
2 parents 9505e50 + af001ff commit 03edaef

File tree

12 files changed

+43
-19
lines changed

12 files changed

+43
-19
lines changed

wolfCLU/src/Intro.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Nov, 24, 2021
66

77

88
## Intro
9-
wolfCLU was created to handle some common cryptographic operations to make it easier/quicker then writing an application from scratch. An example of some of the operations handled are certificate parsing and key generation.
9+
wolfCLU was created to handle some common cryptographic operations to make it easier/quicker than writing an application from scratch. An example of some of the operations handled are certificate parsing and key generation.

wolfCLU/src/bench.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
### BENCH Command
2-
Command in progress for benchmarking algorithms. Current use to run all algorithms would be "wolfssl bench -all".
2+
Command in progress for benchmarking algorithms. To benchmark all algorithms run "wolfssl bench -all".

wolfCLU/src/build.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Building wolfCLU
22

33
### Building on *NIX
4-
To build wolfCLU first build wolfSSL with the --enable-wolfclu flag. An example of this would be:
4+
To build wolfCLU, start by building wolfSSL with the --enable-wolfclu flag. An example of this would be:
55

66
```
77
cd wolfssl
@@ -34,11 +34,11 @@ Run `make check` to run unit tests.
3434

3535
## Building on Windows
3636

37-
wolfCLU can also be built with its Visual Studios solution, wolfclu.sln. The solution provides both Debug and Release builds of Dynamic 32- or 64-bit libraries. The file `user_settings.h` should be used in the wolfSSL build to configure it.
37+
wolfCLU can also be built with the appropriate Visual Studio solution, wolfclu.sln. The solution provides both Debug and Release builds of Dynamic 32- or 64-bit libraries. The file `user_settings.h` should be used in the wolfSSL build to configure it.
3838

3939
The file `wolfclu\ide\winvs\user_settings.h` contains the settings used to configure wolfSSL with the appropriate settings. This file must be copied from the directory `wolfclu\ide\winvs` to `wolfssl\IDE\WIN`. You can then build wolfSSL with support for wolfCLU.
4040

41-
Before building wolfCLU, Make sure you have the same architecture (Win32 or x64) selected as used in wolfSSL.
41+
Before building wolfCLU, make sure you have the same architecture (Win32 or x64) selected as used in wolfSSL.
4242

4343
This project assumes that the wolfSSH and wolfSSL source directories
4444
are installed side-by-side and do not have the version number in their
@@ -49,7 +49,7 @@ names:
4949
wolfssl\
5050
```
5151

52-
Building wolfCLU a release configuration will generate `wolfssl.exe` in the
52+
Building a wolfCLU release configuration will generate `wolfssl.exe` in the
5353
`Release\Win32` or `Release\x64` directory.
5454

5555
#### Running Unit Tests

wolfCLU/src/crl.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### CRL Command
2-
Used to verify a CRL file given a CA. Or to convert a CRL from one format [DER | PEM] to the other. The command will also print out the CRL to stdout if -out is not specified and -noout is not used. Prints out "OK" on successful verification.
2+
Used to verify a CRL file given a CA, or to convert a CRL from one format [DER | PEM] to the other. The command will print out the CRL to stdout if -out is not specified and -noout is not used. Prints out "OK" on successful verification.
33

44
- [-CAfile] <ca file name>
55
- [-inform] pem or der in format
@@ -12,4 +12,4 @@ Example:
1212

1313
```
1414
wolfssl crl -CAfile ./certs/ca-cert.pem -in ./certs/crl.der -inform DER -noout
15-
```
15+
```

wolfCLU/src/dhparam.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ Example:
1414

1515
```
1616
wolfssl dhparam -check -out dh.params 1024
17+
```

wolfCLU/src/dsaparam.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ Example:
1313

1414
```
1515
wolfssl dsaparam -out dsa.params 1024
16+
1617
wolfssl dsaparam -in dsa.params -genkey
1718
```

wolfCLU/src/enc.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
### ENC Command
22

3-
Used for encrypting an input and with (-d) can decrypt also.
3+
Used for encrypting an input. Setting -d enables decryption.
44

55
Available encryption and decryption algorithms are:
66

@@ -35,4 +35,4 @@ Example:
3535

3636
```
3737
wolfssl enc -aes-128-cbc -k Thi$i$myPa$$w0rd -in somefile.txt
38-
```
38+
```

wolfCLU/src/md5.md

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,33 @@
11
### MD5 Command
2-
Used to create a MD5 hash of input data. The last argument is the file to be hashed, if a file argument is not used then stdin is pulled for data to be hashed.
2+
Used to create an MD5 hash of input data. The last argument is the file to be hashed, if a file argument is not provided then stdin is used. Note that when using stdin the input must be provided upon calling wolfssl. A correct usage and incorrect usage of stdin are shown below:
33

4+
Incorrect :
45

5-
Example :
6+
```
7+
wolfssl md5
8+
> hi
9+
>
10+
```
11+
Correct :
12+
13+
```
14+
echo "hi" | wolfssl md5
15+
```
16+
17+
The reason the incorrect version is wrong is because no output will be received. This input method is used because it mimics the usage of OpenSSL's CLI, thus it encourages portability when switching from OpenSSL to WolfSSL.
18+
19+
20+
Examples :
621

722
```
823
wolfssl md5 configure.ac
24+
925
978425cba5277d73db2a76d72b523d48
26+
1027
```
1128

1229
```
1330
echo "hi" | wolfssl md5
31+
1432
764efa883dda1e11db47671c4a3bbd9e
15-
```
33+
```

wolfCLU/src/pkcs12.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### PKCS12 Command
2-
Currently only PKCS12 parsing is supported and PKCS12 generation is not yet supported. By default the --enable-wolfclu option used when building wolfSSL has PKCS12 support also enabled but it does not enable RC2. If parsing PKCS12 bundles that have been encrypted using RC2 then --enable-rc2 should also be used when compiling wolfSSL.
2+
Currently only PKCS12 parsing is supported and PKCS12 generation is not yet supported. By default the --enable-wolfclu option used when building wolfSSL has PKCS12 support enabled but it does not enable RC2. If parsing PKCS12 bundles that have been encrypted using RC2 then --enable-rc2 should also be used when compiling wolfSSL.
33

44
- [-in] file input for pkcs12 bundle
55
- [-out] file to output results to (default stdout)
@@ -12,5 +12,5 @@ Currently only PKCS12 parsing is supported and PKCS12 generation is not yet supp
1212
Example:
1313

1414
```
15-
./wolfssl pkcs12 -nodes -passin pass:"wolfSSL test" -in ./certs/test-servercert.p12
15+
wolfssl pkcs12 -nodes -passin pass:"wolfSSL test" -in ./certs/test-servercert.p12
1616
```

wolfCLU/src/rand.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
### RAND Command
2-
Generates random bytes in raw or base64 form. By default it outputs the result to stdout but can be redirected with using the '-out' argument. The last argument passed in is the number of random bytes to generate.
2+
Generates random bytes in raw or base64 form. By default it outputs the result to stdout but can be redirected with the '-out' argument. The last argument passed in is the number of random bytes to generate.
33

44
- [-base64] base64 encode the resulting random bytes
55
- [-out] ouput file to write results to

0 commit comments

Comments
 (0)