accept PGP v3 or v4 fingerprint as alternative to PGP user_id

testing/tests/ikev2/net2net-pgp-v3/hosts/moon/etc/ipsec.conf

@@ -14,6 +14,7 @@ conn net-net
 	left=PH_IP_MOON
 	leftsubnet=10.1.0.0/16
 	leftcert=moonCert.asc
+	leftid=@#71270432cd763a18020ac988c0e75aed
 	leftfirewall=yes
 	right=PH_IP_SUN
 	rightsubnet=10.2.0.0/16

testing/tests/ikev2/net2net-pgp-v3/hosts/sun/etc/ipsec.conf

@@ -18,4 +18,5 @@ conn net-net
 	right=PH_IP_MOON
 	rightsubnet=10.1.0.0/16
 	rightcert=moonCert.asc
+	rightid=@#71270432cd763a18020ac988c0e75aed
 	auto=add

testing/tests/ikev2/net2net-pgp-v4/hosts/moon/etc/ipsec.conf

@@ -18,4 +18,5 @@ conn net-net
 	right=PH_IP_SUN
 	rightsubnet=10.2.0.0/16
 	rightcert=sunCert.asc
+	rightid=@#b42f31fec80ae3264a101c85977a04ac8d1638d3
 	auto=add

testing/tests/ikev2/net2net-pgp-v4/hosts/sun/etc/ipsec.conf

@@ -14,6 +14,7 @@ conn net-net
 	left=PH_IP_SUN
 	leftsubnet=10.2.0.0/16
 	leftcert=sunCert.asc
+        leftid=@#b42f31fec80ae3264a101c85977a04ac8d1638d3
 	leftfirewall=yes
 	right=PH_IP_MOON
 	rightsubnet=10.1.0.0/16