Setup PKI VPN between pfsense and OSX (viscosity)

[rockinthesixstring]

I've never had so much difficulty setting something up that appears to be simple.  All of the doc's that I get redirected to refer to pfsense v2.0, so I  can't seem to find a good step by step tutorial.

I've run the commands found here, and they've created the following file list

total 54
-rw-r–r--  1 root  wheel  4022 Apr 16 20:52 01.pem
-rw-r--r--  1 root  wheel  3905 Apr 16 20:55 02.pem
-rw-r--r--  1 root  wheel  3971 Apr 16 21:18 03.pem
-rw-r--r--  1 root  wheel  1322 Apr 16 20:52 ca.crt
-rw-------  1 root  wheel  887 Apr 16 20:52 ca.key
-rw-r--r--  1 root  wheel  3905 Apr 16 20:55 client1.crt
-rw-r--r--  1 root  wheel  692 Apr 16 20:55 client1.csr
-rw-------  1 root  wheel  891 Apr 16 20:55 client1.key
-rw-r--r--  1 root  wheel  245 Apr 16 20:55 dh1024.pem
-rw-r--r--  1 root  wheel  3971 Apr 16 21:18 frodo.crt
-rw-r--r--  1 root  wheel  822 Apr 16 21:18 frodo.csr
-rw-------  1 root  wheel  887 Apr 16 21:18 frodo.key
-rw-r--r--  1 root  wheel  382 Apr 16 21:18 index.txt
-rw-r--r--  1 root  wheel    20 Apr 16 21:18 index.txt.attr
-rw-r--r--  1 root  wheel    20 Apr 16 20:55 index.txt.attr.old
-rw-r--r--  1 root  wheel  241 Apr 16 20:55 index.txt.old
-rw-r--r--  1 root  wheel    3 Apr 16 21:18 serial
-rw-r--r--  1 root  wheel    3 Apr 16 20:55 serial.old
-rw-r--r--  1 root  wheel  4022 Apr 16 20:52 server.crt
-rw-r--r--  1 root  wheel  692 Apr 16 20:52 server.csr
-rw-------  1 root  wheel  887 Apr 16 20:52 server.key

Which files do I need to put in the pfsense server config area, and which files do I need to input into Viscosity?  I've tried what I 'think' is correct, but I keep getting rejected.

[kpa]

Server:
ca.crt
server.crt
server.key
dh1024.pem

Client:
ca.crt
client1.crt
client1.key

[rockinthesixstring]

@kpa:

Server:
ca.crt
server.crt
server.key
dh1024.pem

Client:
ca.crt
client1.crt
client1.key

Worked like a champ thanks (PS - Client1 was actually "frodo" in my situation)