Thread: [Ipsec-tools-commits] ipsec-tools/src/racoon ChangeLog.prsa,1.1.2.27,1.1.2.28 cfparse.y,1.9.4.8,1.9.
Brought to you by:
mit_warlord,
netbsd
From: Michal L. <lu...@us...> - 2004-06-25 17:14:19
|
Update of /cvsroot/ipsec-tools/ipsec-tools/src/racoon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9676 Modified Files: Tag: plainrsa ChangeLog.prsa cfparse.y Log Message: 2004-06-25 Michal Ludvig <ml...@su...> * cfparse.y: Only check RSA keys if in PlainRSA mode. Index: ChangeLog.prsa =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/Attic/ChangeLog.prsa,v retrieving revision 1.1.2.27 retrieving revision 1.1.2.28 diff -u -d -r1.1.2.27 -r1.1.2.28 --- ChangeLog.prsa 25 Jun 2004 16:34:43 -0000 1.1.2.27 +++ ChangeLog.prsa 25 Jun 2004 17:14:10 -0000 1.1.2.28 @@ -3,6 +3,7 @@ 2004-06-25 Michal Ludvig <ml...@su...> + * cfparse.y: Only check RSA keys if in PlainRSA mode. * plainrsa-gen.c (gen_rsa_key): Pubkey is commented out. (main): Set umask. * prsa_par.y (prsaerror): Less verbose output. Index: cfparse.y =================================================================== RCS file: /cvsroot/ipsec-tools/ipsec-tools/src/racoon/cfparse.y,v retrieving revision 1.9.4.8 retrieving revision 1.9.4.9 diff -u -d -r1.9.4.8 -r1.9.4.9 --- cfparse.y 25 Jun 2004 16:34:43 -0000 1.9.4.8 +++ cfparse.y 25 Jun 2004 17:14:10 -0000 1.9.4.9 @@ -1191,15 +1191,17 @@ VENDORID_GSSAPI; break; case algtype_rsasig: - if (rsa_list_count(cur_rmconf->rsa_private) == 0) { - yyerror ("Private PlainRSA key not set. " - "Use directive 'certificate_type plainrsa ...'\n"); - return -1; - } - if (rsa_list_count(cur_rmconf->rsa_public) == 0) { - yyerror ("Public PlainRSA keys not set. " - "Use directive 'peers_certfile plainrsa ...'\n"); - return -1; + if (cur_rmconf->certtype == ISAKMP_CERT_PLAINRSA) { + if (rsa_list_count(cur_rmconf->rsa_private) == 0) { + yyerror ("Private PlainRSA key not set. " + "Use directive 'certificate_type plainrsa ...'\n"); + return -1; + } + if (rsa_list_count(cur_rmconf->rsa_public) == 0) { + yyerror ("Public PlainRSA keys not set. " + "Use directive 'peers_certfile plainrsa ...'\n"); + return -1; + } } break; default: |