Browse Source

Fix: specified scheme index ignored

Rod Hynes 9 years ago
parent
commit
f77e372cd7
1 changed files with 3 additions and 3 deletions
  1. 3 3
      psiphon/common/osl/paver/main.go

+ 3 - 3
psiphon/common/osl/paver/main.go

@@ -109,14 +109,14 @@ func main() {
 	for _, keySplit := range config.Schemes[scheme].SeedPeriodKeySplits {
 	for _, keySplit := range config.Schemes[scheme].SeedPeriodKeySplits {
 		slokTimePeriodsPerOSL *= keySplit.Total
 		slokTimePeriodsPerOSL *= keySplit.Total
 	}
 	}
-	oslTimePeriod := time.Duration(config.Schemes[0].SeedPeriodNanoseconds * int64(slokTimePeriodsPerOSL))
+	oslTimePeriod := time.Duration(config.Schemes[scheme].SeedPeriodNanoseconds * int64(slokTimePeriodsPerOSL))
 
 
-	for _, propagationChannelID := range config.Schemes[0].PropagationChannelIDs {
+	for _, propagationChannelID := range config.Schemes[scheme].PropagationChannelIDs {
 
 
 		paveServerEntries := make([]map[time.Time]string, len(config.Schemes))
 		paveServerEntries := make([]map[time.Time]string, len(config.Schemes))
 		paveServerEntries[0] = make(map[time.Time]string)
 		paveServerEntries[0] = make(map[time.Time]string)
 
 
-		epoch, _ := time.Parse(time.RFC3339, config.Schemes[0].Epoch)
+		epoch, _ := time.Parse(time.RFC3339, config.Schemes[scheme].Epoch)
 		for i := oslOffset; i < oslOffset+oslCount; i++ {
 		for i := oslOffset; i < oslOffset+oslCount; i++ {
 			paveServerEntries[0][epoch.Add(time.Duration(i)*oslTimePeriod)] = ""
 			paveServerEntries[0][epoch.Add(time.Duration(i)*oslTimePeriod)] = ""
 		}
 		}