From edd8dd17a0b6dd44572c37118dad3af33da3366b Mon Sep 17 00:00:00 2001 From: Jessica James Date: Fri, 3 Mar 2017 19:27:44 -0600 Subject: [PATCH] Updated files for usage with OpenSSL 1.1.0e; some of these changes may be reverted when I get around to abstracting SSL implementation details further. --- Jupiter/Jupiter.vcxproj | 4 ++-- Jupiter/SecureSocket.cpp | 6 +++--- Jupiter/SecureSocket.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Jupiter/Jupiter.vcxproj b/Jupiter/Jupiter.vcxproj index 6d0b231..c3d4b63 100644 --- a/Jupiter/Jupiter.vcxproj +++ b/Jupiter/Jupiter.vcxproj @@ -136,7 +136,7 @@ NotSet 0.0 MachineX86 - libeay32MD.lib;ssleay32MD.lib;%(AdditionalDependencies) + libcrypto32MD.lib;libssl32MD.lib;%(AdditionalDependencies) @@ -168,7 +168,7 @@ true NotSet 0.0 - libeay32MD.lib;ssleay32MD.lib;%(AdditionalDependencies) + libcrypto64MD.lib;libssl64MD.lib;%(AdditionalDependencies) diff --git a/Jupiter/SecureSocket.cpp b/Jupiter/SecureSocket.cpp index afbd73f..65632d3 100644 --- a/Jupiter/SecureSocket.cpp +++ b/Jupiter/SecureSocket.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013-2016 Jessica James. + * Copyright (C) 2013-2017 Jessica James. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -122,8 +122,8 @@ const SSL_METHOD *translateEncryptionMethod(Jupiter::SecureSocket::EncryptionMet { switch (method) { - case Jupiter::SecureSocket::EncryptionMethod::SSL3: - return SSLv3_method(); + //case Jupiter::SecureSocket::EncryptionMethod::SSL3: + // return SSLv3_method(); case Jupiter::SecureSocket::EncryptionMethod::TLS1: return TLSv1_method(); case Jupiter::SecureSocket::EncryptionMethod::TLS1_1: diff --git a/Jupiter/SecureSocket.h b/Jupiter/SecureSocket.h index 21f32f9..13e9d7b 100644 --- a/Jupiter/SecureSocket.h +++ b/Jupiter/SecureSocket.h @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013-2016 Jessica James. + * Copyright (C) 2013-2017 Jessica James. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -45,7 +45,7 @@ namespace Jupiter */ enum EncryptionMethod { - SSL3 = 1, /** SSL 3.0 - Unrecommended */ + //SSL3 = 1, /** SSL 3.0 - Unrecommended */ TLS1 = 2, /** TLS 1.0 - Unrecommended */ TLS1_1 = 3, /** TLS 1.1 */ TLS1_2 = 4, /** TLS 1.2 */