From 86ced1769ac26aa30711c5d349cada1e618e4f89 Mon Sep 17 00:00:00 2001 From: Jonathan Schleifer Date: Mon, 6 Apr 2020 01:10:19 +0200 Subject: [PATCH] Fix type mismatch with GCC --- configure.ac | 2 +- src/ObjOpenSSL.h | 4 ++-- src/SSLConnectionFailedException.h | 4 ++-- src/SSLConnectionFailedException.m | 4 ++-- src/SSLInvalidCertificateException.h | 4 ++-- src/SSLInvalidCertificateException.m | 4 ++-- src/SSLSocket.h | 4 ++-- src/SSLSocket.m | 12 ++++++------ src/X509Certificate.h | 4 ++-- src/X509Certificate.m | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/configure.ac b/configure.ac index 23f56e6..09dc23b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(ObjOpenSSL, 0.1, js@heap.zone) +AC_INIT(ObjOpenSSL, 0.1, js@nil.im) AC_CONFIG_SRCDIR(src) AC_CONFIG_AUX_DIR(build-aux) diff --git a/src/ObjOpenSSL.h b/src/ObjOpenSSL.h index 737f091..37147dc 100644 --- a/src/ObjOpenSSL.h +++ b/src/ObjOpenSSL.h @@ -1,7 +1,7 @@ /* - * Copyright (c) 2011, Jonathan Schleifer + * Copyright (c) 2011, Jonathan Schleifer * - * https://heap.zone/git/objopenssl.git + * https://git.nil.im/objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/SSLConnectionFailedException.h b/src/SSLConnectionFailedException.h index 528f634..f195550 100644 --- a/src/SSLConnectionFailedException.h +++ b/src/SSLConnectionFailedException.h @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016, Jonathan Schleifer + * Copyright (c) 2016, Jonathan Schleifer * - * https://heap.zone/git/objopenssl.git + * https://git.nil.im/objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/SSLConnectionFailedException.m b/src/SSLConnectionFailedException.m index 0885953..eb664f5 100644 --- a/src/SSLConnectionFailedException.m +++ b/src/SSLConnectionFailedException.m @@ -1,7 +1,7 @@ /* - * Copyright (c) 2016, Jonathan Schleifer + * Copyright (c) 2016, Jonathan Schleifer * - * https://heap.zone/git/objopenssl.git + * https://git.nil.im/objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/SSLInvalidCertificateException.h b/src/SSLInvalidCertificateException.h index 353608e..1f40794 100644 --- a/src/SSLInvalidCertificateException.h +++ b/src/SSLInvalidCertificateException.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2011, Florian Zeitz - * Copyright (c) 2013, Jonathan Schleifer + * Copyright (c) 2013, Jonathan Schleifer * - * https://heap.zone/git/objopenssl.git + * https://git.nil.im/objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/SSLInvalidCertificateException.m b/src/SSLInvalidCertificateException.m index 00f9a33..eeb5504 100644 --- a/src/SSLInvalidCertificateException.m +++ b/src/SSLInvalidCertificateException.m @@ -1,8 +1,8 @@ /* * Copyright (c) 2011, Florian Zeitz - * Copyright (c) 2012, 2013, 2016, Jonathan Schleifer + * Copyright (c) 2012, 2013, 2016, Jonathan Schleifer * - * https://heap.zone/git/objopenssl.git + * https://git.nil.im/objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/SSLSocket.h b/src/SSLSocket.h index 8a626b7..973fa93 100644 --- a/src/SSLSocket.h +++ b/src/SSLSocket.h @@ -1,8 +1,8 @@ /* - * Copyright (c) 2011, 2013, 2015, Jonathan Schleifer + * Copyright (c) 2011, 2013, 2015, Jonathan Schleifer * Copyright (c) 2011, Florian Zeitz * - * https://heap.zone/git/objopenssl.git + * https://git.nil.im/objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/SSLSocket.m b/src/SSLSocket.m index 229e646..c39198d 100644 --- a/src/SSLSocket.m +++ b/src/SSLSocket.m @@ -1,10 +1,10 @@ /* - * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 - * Jonathan Schleifer + * Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 + * Jonathan Schleifer * Copyright (c) 2011, Florian Zeitz * Copyright (c) 2011, Jos Kuijpers * - * https://heap.zone/git/objopenssl.git + * https://git.nil.im/objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -144,15 +144,15 @@ lockingCallback(int mode, int n, const char *file, int line) [super dealloc]; } -- (void)socket: (OF_KINDOF(OFTCPSocket *))sock +- (void)socket: (OFTCPSocket *)sock didConnectToHost: (OFString *)host port: (uint16_t)port exception: (id)exception { if (exception == nil) { @try { - [sock SSL_startTLSWithExpectedHost: _host - port: _port]; + [(SSLSocket *)sock SSL_startTLSWithExpectedHost: _host + port: _port]; } @catch (id e) { exception = e; } diff --git a/src/X509Certificate.h b/src/X509Certificate.h index 1af2865..71bd44c 100644 --- a/src/X509Certificate.h +++ b/src/X509Certificate.h @@ -1,8 +1,8 @@ /* * Copyright (c) 2011, Florian Zeitz - * Copyright (c) 2013, 2016, Jonathan Schleifer + * Copyright (c) 2013, 2016, Jonathan Schleifer * - * https://heap.zone/git/objopenssl.git + * https://git.nil.im/objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/src/X509Certificate.m b/src/X509Certificate.m index 8b9b898..7c21943 100644 --- a/src/X509Certificate.m +++ b/src/X509Certificate.m @@ -1,8 +1,8 @@ /* * Copyright (c) 2011, Florian Zeitz - * Copyright (c) 2011, 2012, 2013, 2015, Jonathan Schleifer + * Copyright (c) 2011, 2012, 2013, 2015, Jonathan Schleifer * - * https://heap.zone/git/objopenssl.git + * https://git.nil.im/objopenssl.git * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above