equal
deleted
inserted
replaced
167 *ca_copy = *(aData->iCAList->At(x)); |
167 *ca_copy = *(aData->iCAList->At(x)); |
168 iCAList->AppendL(ca_copy); |
168 iCAList->AppendL(ca_copy); |
169 CleanupStack::Pop(ca_copy); |
169 CleanupStack::Pop(ca_copy); |
170 } |
170 } |
171 } |
171 } |
172 |
|
173 iUseCache = aData->iUseCache; |
|
174 } |
172 } |
175 |
173 |
176 void CIkeData::Empty() |
174 void CIkeData::Empty() |
177 { |
175 { |
178 TProposalData* prop = iPropList; |
176 TProposalData* prop = iPropList; |
451 err = KSecParserErrMode; |
449 err = KSecParserErrMode; |
452 } |
450 } |
453 else if (token.CompareF(_L("IKE_VERSION:"))==0) //CompareF ignores case |
451 else if (token.CompareF(_L("IKE_VERSION:"))==0) //CompareF ignores case |
454 { |
452 { |
455 sub_num = NextToken(); |
453 sub_num = NextToken(); |
456 sub_num.Val(aConf->iIkeVersion, EDecimal); |
454 if ( sub_num.Val(aConf->iIkeVersion, EDecimal) != KErrNone ) |
457 if ( aConf->iIkeVersion != 2 ) |
455 { |
|
456 err = KSecParserErrUnknown; |
|
457 } |
|
458 else if ( aConf->iIkeVersion != 2 ) |
458 aConf->iIkeVersion = 1; // IKE version 1 is currently the default |
459 aConf->iIkeVersion = 1; // IKE version 1 is currently the default |
459 } |
460 } |
460 else if (token.CompareF(_L("SEND_NOTIFICATION:"))==0) //CompareF ignores case |
461 else if (token.CompareF(_L("SEND_NOTIFICATION:"))==0) //CompareF ignores case |
461 { |
462 { |
462 token.Set(NextToken()); |
463 token.Set(NextToken()); |
725 else if (token.CompareF(_L("OWN_CERTS:"))==0) //CompareF ignores case |
726 else if (token.CompareF(_L("OWN_CERTS:"))==0) //CompareF ignores case |
726 err = ParseOwnCerts(aConf); |
727 err = ParseOwnCerts(aConf); |
727 //PeerCerts List |
728 //PeerCerts List |
728 else if (token.CompareF(_L("PEER_CERTS:"))==0) //CompareF ignores case |
729 else if (token.CompareF(_L("PEER_CERTS:"))==0) //CompareF ignores case |
729 err = ParsePeerCerts(aConf); |
730 err = ParsePeerCerts(aConf); |
730 else if (token.CompareF(_L("USE_CACHE:"))==0) //CompareF ignores case |
|
731 { |
|
732 aConf->iUseCache = EFalse; |
|
733 token.Set(NextToken()); |
|
734 if (token.CompareF(_L("True"))==0) |
|
735 aConf->iUseCache = ETrue; |
|
736 } |
|
737 } |
731 } |
738 if ( err == KErrNone ) |
732 if ( err == KErrNone ) |
739 errCA=CheckPolicy(aConf); |
733 errCA=CheckPolicy(aConf); |
740 if (errCA) |
734 if (errCA) |
741 err=errCA; |
735 err=errCA; |
1112 else |
1106 else |
1113 line.Append(_L("FALSE\n")); |
1107 line.Append(_L("FALSE\n")); |
1114 err = BufferAppend(aPolBfr, line); |
1108 err = BufferAppend(aPolBfr, line); |
1115 if (err != KErrNone) |
1109 if (err != KErrNone) |
1116 return err; |
1110 return err; |
1117 |
|
1118 line.Copy(_L8("USE_CACHE: ")); |
|
1119 if (aConf->iUseCache) |
|
1120 line.Append(_L("TRUE\n")); |
|
1121 else |
|
1122 line.Append(_L("FALSE\n")); |
|
1123 err = BufferAppend(aPolBfr, line); |
|
1124 if (err != KErrNone) |
|
1125 return err; |
|
1126 |
|
1127 if ( aConf->iCRACKLAMUserName ) |
1111 if ( aConf->iCRACKLAMUserName ) |
1128 { |
1112 { |
1129 line.Copy(_L8("CRACK_LAM_USERNAME: ")); |
1113 line.Copy(_L8("CRACK_LAM_USERNAME: ")); |
1130 line.Append(aConf->iCRACKLAMUserName->GetData()); |
1114 line.Append(aConf->iCRACKLAMUserName->GetData()); |
1131 line.Append(_L8("\n")); |
1115 line.Append(_L8("\n")); |