Diff
Not logged in

Differences From Artifact [35cc36d7dc]:

To Artifact [ec1daa0ca3]:


764
765
766
767
768
769
770













771
772
773
774
775
776
777
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790







+
+
+
+
+
+
+
+
+
+
+
+
+







  }

  if {[certificate warning -type Script -hashalgorithm \
      $hashAlgorithmName -- $certificateFile] ne "WarningOk"} then {
    emitError [appendArgs \
        "failed to add warning for " $fileType " \"" $fileName \"]
  }

  #
  # BUGFIX: Since we are going to [source] an external file (i.e. via
  #         [package require]), make sure the default (bootstrap) key
  #         rings are loaded first, but only if we are running with
  #         script security enabled.  Technically, this should not be
  #         required if script security was enabled through a typical
  #         mechanism, e.g. [source enableSecurity], etc.
  #
  if {[security ""]} then {
    keyring clear; keyring bootstrap
    emitWarning "cleared key rings and merged all bootstrap key rings"
  }

  #
  # HACK: Reformat some of the spacing in the certificate file to make
  #       it easier to read.
  #
  package require Harpy.Test; reformatCertificateSpacing $certificateFile