Merge commit '7621e2f8dec938cf48181c8b10afc9b01f444e68' into beta

submodules/PKCS/BUILD

@@ -0,0 +1,28 @@
+
+objc_library(
+    name = "PKCS",
+    enable_modules = True,
+    module_name = "PKCS",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ], allow_empty=True),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    copts = [
+        "-DTELEGRAM_USE_BORINGSSL=1",
+    ],
+    deps = [
+        "//third-party/boringssl:crypto",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)

submodules/PKCS/PublicHeaders/PKCS/PKCS.h

@@ -0,0 +1,15 @@
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MTPKCS : NSObject
+
+@property (nonatomic, strong, readonly) NSString *issuerName;
+@property (nonatomic, strong, readonly) NSString *subjectName;
+@property (nonatomic, strong, readonly) NSData *data;
+
++ (MTPKCS * _Nullable)parse:(const unsigned char *)buffer size:(int)size;
+
+@end
+
+NS_ASSUME_NONNULL_END

submodules/PKCS/Sources/PKCS.m

@@ -0,0 +1,130 @@
+#import <PKCS/PKCS.h>
+
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
+#include <openssl/pem.h>
+
+static NSString * _Nullable readName(X509_NAME *subject) {
+    BIO *subjectBio = BIO_new(BIO_s_mem());
+    X509_NAME_print_ex(subjectBio, subject, 0, XN_FLAG_RFC2253);
+    char *dataStart = NULL;
+    long nameLength = BIO_get_mem_data(subjectBio, &dataStart);
+    NSString *result = [[NSString alloc] initWithBytes:dataStart length:nameLength encoding:NSUTF8StringEncoding];
+    BIO_free(subjectBio);
+    return result;
+}
+
+static NSData * _Nullable readPublicKey(EVP_PKEY *subject) {
+    BIO *subjectBio = BIO_new(BIO_s_mem());
+    PEM_write_bio_PUBKEY(subjectBio, subject);
+    char *dataStart = NULL;
+    long nameLength = BIO_get_mem_data(subjectBio, &dataStart);
+    NSString *result = [[NSString alloc] initWithBytes:dataStart length:nameLength encoding:NSUTF8StringEncoding];
+    BIO_free(subjectBio);
+    return [result dataUsingEncoding:NSUTF8StringEncoding];
+}
+
+@implementation MTPKCS
+
+- (instancetype)initWithIssuerName:(NSString *)issuerName subjectName:(NSString *)subjectName data:(NSData *)data {
+    self = [super init];
+    if (self != nil) {
+        _issuerName = issuerName;
+        _subjectName = subjectName;
+        _data = data;
+    }
+    return self;
+}
+
++ (MTPKCS * _Nullable)parse:(const unsigned char *)buffer size:(int)size {
+#if TARGET_OS_IOS
+#ifdef TELEGRAM_USE_BORINGSSL
+    BIO *pkcsBio = BIO_new(BIO_s_mem());
+    BIO_write(pkcsBio, buffer, size);
+    STACK_OF(X509) *signers = NULL;
+    PKCS7_get_PEM_certificates(signers, pkcsBio);
+    if (signers == NULL) {
+        BIO_free(pkcsBio);
+        return nil;
+    }
+
+    const X509* cert = sk_X509_pop(signers);
+    if (cert == NULL) {
+        if (signers) {
+            sk_X509_free(signers);
+        }
+        BIO_free(pkcsBio);
+        return nil;
+    }
+    
+    X509_NAME *issuerName = X509_get_issuer_name(cert);
+    X509_NAME *subjectName = X509_get_subject_name(cert);
+    
+    NSString *issuerNameString = readName(issuerName);
+    NSString *subjectNameString = readName(subjectName);
+    
+    EVP_PKEY *publicKey = X509_get_pubkey(cert);
+    NSData *data = readPublicKey(publicKey);
+    
+    MTPKCS *result = [[MTPKCS alloc] initWithIssuerName:issuerNameString subjectName:subjectNameString data:data];
+
+    BIO_free(pkcsBio);
+    
+    return result;
+#else
+    MTPKCS * _Nullable result = nil;
+    PKCS7 *pkcs7 = NULL;
+    STACK_OF(X509) *signers = NULL;
+    
+    pkcs7 = d2i_PKCS7(NULL, &buffer, size);
+    if (pkcs7 == NULL) {
+        return nil;
+    }
+    
+    if (!PKCS7_type_is_signed(pkcs7)) {
+        if (pkcs7) {
+            PKCS7_free(pkcs7);
+        }
+        return nil;
+    }
+    
+    signers = PKCS7_get0_signers(pkcs7, NULL, PKCS7_BINARY);
+    if (signers == NULL) {
+        if (pkcs7) {
+            PKCS7_free(pkcs7);
+        }
+        return nil;
+    }
+    
+    const X509* cert = sk_X509_pop(signers);
+    if (cert == NULL) {
+        if (signers) {
+            sk_X509_free(signers);
+        }
+        if (pkcs7) {
+            PKCS7_free(pkcs7);
+        }
+        
+        return nil;
+    }
+    
+    X509_NAME *issuerName = X509_get_issuer_name(cert);
+    X509_NAME *subjectName = X509_get_subject_name(cert);
+    
+    NSString *issuerNameString = readName(issuerName);
+    NSString *subjectNameString = readName(subjectName);
+    
+    EVP_PKEY *publicKey = X509_get_pubkey(cert);
+    NSData *data = readPublicKey(publicKey);
+    
+    result = [[MTPKCS alloc] initWithIssuerName:issuerNameString subjectName:subjectNameString data:data];
+    
+    return result;
+#endif
+#else
+    return nil;
+#endif
+   
+}
+
+@end