@@ -103,24 +103,23 @@ function conditionallyApplyUpdate(update) {
103103 return ;
104104 }
105105 if ( updateObj . branch !== extBranch ) {
106- https_everywhereLog ( WARN , 'Downloaded a ruleset update for the incorrect branch.' ) ;
106+ https_everywhereLog ( NOTE , 'Downloaded a ruleset update for the incorrect branch.' ) ;
107107 return ;
108108 }
109109 var sigFileSrc = _prefs . getCharPref ( RSUPDATE_SIG_URL_PREF ) ;
110- HTTPSEverywhere . instance . try_request ( MAX_RSUPDATE_FETCHES , 'GET' , sigFileSrc ,
111- function ( signature ) {
112- signature = signature . trim ( ) ;
113- https_everywhereLog ( INFO , "Successfully fetched update.json.sig file data" ) ;
114- if ( verifyUpdateSignature ( update , signature ) ) {
115- https_everywhereLog ( INFO , "Ruleset update data signature verified successfully" ) ;
116- fetchVerifyAndApplyDBFile ( updateObj . source , updateObj . version , updateObj . hashfn , updateObj . hash ) ;
117- } else {
118- https_everywhereLog ( WARN , 'Validation of the update signature provided failed.' ) ;
119- // TODO
120- // Ping the verification-failure-reporting URL
121- }
122- } ) ;
123- }
110+ HTTPSEverywhere . instance . try_request ( MAX_RSUPDATE_FETCHES , 'GET' , sigFileSrc , function ( signature ) {
111+ signature = signature . trim ( ) ;
112+ https_everywhereLog ( INFO , "Successfully fetched update.json.sig file data" ) ;
113+ if ( verifyUpdateSignature ( update , signature ) ) {
114+ https_everywhereLog ( INFO , "Ruleset update data signature verified successfully" ) ;
115+ fetchVerifyAndApplyDBFile ( updateObj . source , updateObj . version , updateObj . hashfn , updateObj . hash ) ;
116+ } else {
117+ https_everywhereLog ( WARN , 'Validation of the update signature provided failed.' ) ;
118+ // TODO
119+ // Ping the verification-failure-reporting URL
120+ }
121+ } ) ;
122+ } ) ;
124123}
125124
126125/* Attempts to verify the provided signature over updateStr using
0 commit comments