Signal-iOS/SignalServiceKit/src/Util/Data+MessagePadding.swift
Evan Hahn 370ff654e7
Change license to AGPL
Change license to AGPL

This commit:

- Updates the `LICENSE` file

- Start every file with something like:

      // Copyright YEAR_FIRST_PUBLISHED Signal Messenger, LLC
      // SPDX-License-Identifier: AGPL-3.0-only

---

First, I removed existing license headers with this Ruby 3.1.2 script:

    require 'set'

    EXTENSIONS_TO_CHECK = Set['.h', '.hpp', '.cpp', '.m', '.mm', '.pch', '.swift']

    same = 0
    different = 0

    all_files = `git ls-files`.lines.map { |line| line.strip }
    all_files.each do |relative_path|
      if relative_path == 'Pods'
        next
      end

      unless EXTENSIONS_TO_CHECK.include? File.extname(relative_path)
        next
      end

      path = File.expand_path(relative_path)

      contents = File.read(path)
      new_contents = contents.sub(/\/\/\n\/\/  Copyright .*\n\/\/\n\n/, '')

      if contents == new_contents
        same += 1
      else
        different += 1
      end

      File.write(path, new_contents)
    end

    puts "updated #{different} file(s), left #{same} untouched"

I'm sure this script could be improved, but it worked well enough.

Then, I created `Scripts/lint/lint-license-headers` and ran it to auto-
fix a lot of files. This changed the mode of some files, but I think
that's actually desirable. For example,
`SignalServiceKit/src/Util/AppContext.m` previously had a mode of
`0755/-rwxr-xr-x`, and it's now `0644/-rw-r--r--`.

Then I fixed some stragglers and updated the precommit script.

See [a similar change in the Desktop app][0].

[0]: 8bfaf598af
2022-10-13 08:25:37 -05:00

37 lines
1.4 KiB
Swift

//
// Copyright 2022 Signal Messenger, LLC
// SPDX-License-Identifier: AGPL-3.0-only
//
import Foundation
// This code is ported from Android.
// See <https://github.com/signalapp/Signal-Android/blob/cdcb1de3d4c0a6c7ff7f80eed37b490743c311e5/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java#L12-L57>.
extension Data {
public var paddedMessageBody: Data {
let paddingLength: Int = {
// We have our own padding scheme, but so does the cipher.
// The +2 here is to ensure the cipher has room for a padding byte, plus the separator byte.
// The -2 at the end of this undoes that.
let messageLengthWithTerminator = self.count + 2
var messagePartCount = messageLengthWithTerminator / 160
if !messageLengthWithTerminator.isMultiple(of: 160) {
messagePartCount += 1
}
let resultLength = messagePartCount * 160
return resultLength - 2 - self.count
}()
return self + [0x80] + Data(count: paddingLength)
}
public func withoutPadding() -> Data {
guard
let lastNonZeroByteIndex = self.lastIndex(where: { $0 != 0 }),
self[lastNonZeroByteIndex] == 0x80 else {
Logger.warn("Failed to find padding byte, returning unstripped data")
return self
}
return self[..<lastNonZeroByteIndex]
}
}