lib/r509/crl/reader_writer.rb in r509-0.10.0 vs lib/r509/crl/reader_writer.rb in r509-1.0

@@ -40,23 +40,26 @@
         @crl_number_file = nil
         @crl_list_file = nil
       end
 
       # Reads a CRL list file from a file or StringIO
-      # @param admin [R509::CRL::Administrator] the parent CRL Administrator object
-      def read_list(admin)
+      # @yield For each revoked certificate in the CRL
+      # @yieldparam serial [Integer] revoked certificate's serial number
+      # @yieldparam reason [Integer,nil] reason for revocation.
+      # @yieldparam revoke_time [Integer]
+      def read_list
         return nil if @crl_list_file.nil?
 
         data = read_data(@crl_list_file)
 
         data.each_line do |line|
           line.chomp!
           serial,  revoke_time, reason = line.split(',', 3)
           serial = serial.to_i
           reason = (reason == '') ? nil : reason.to_i
           revoke_time = (revoke_time == '') ? nil : revoke_time.to_i
-          admin.revoke_cert(serial, reason, revoke_time, false)
+          yield serial, reason, revoke_time
         end
         nil
       end
 
       # Appends a CRL list entry to a file or StringIO
@@ -64,12 +67,12 @@
       # @param reason [Integer,nil] reason for revocation
       # @param revoke_time [Integer]
       def write_list_entry(serial, revoke_time, reason)
         return nil if @crl_list_file.nil?
 
-        entry = [serial,revoke_time,reason].join(",")
-        write_data(@crl_list_file, entry+"\n" ,'a:ascii-8bit')
+        entry = [serial, revoke_time, reason].join(",")
+        write_data(@crl_list_file, entry + "\n", 'a:ascii-8bit')
       end
 
       # Remove a CRL list entry
       # @param serial [Integer] serial number of the certificate to remove from the list
       def remove_list_entry(serial)
@@ -84,11 +87,11 @@
           revoke_info = line.split(',', 3)
           if revoke_info[0].to_i != serial
             updated_list.push(line)
           end
         end
-        write_data(@crl_list_file, updated_list.join("\n")+"\n")
+        write_data(@crl_list_file, updated_list.join("\n") + "\n")
         nil
       end
 
       # read the CRL number from a file or StringIO
       def read_number
@@ -99,11 +102,10 @@
 
       # write the CRL number to a file or StringIO
       def write_number(crl_number)
         return nil if @crl_number_file.nil?
 
-        write_data(@crl_number_file,crl_number.to_s)
+        write_data(@crl_number_file, crl_number.to_s)
       end
     end
   end
 end
-