Browse Source

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.

release/0.19
Jessica James 8 years ago
parent
commit
edd8dd17a0
  1. 4
      Jupiter/Jupiter.vcxproj
  2. 6
      Jupiter/SecureSocket.cpp
  3. 4
      Jupiter/SecureSocket.h

4
Jupiter/Jupiter.vcxproj

@ -136,7 +136,7 @@
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<Version>0.0</Version> <Version>0.0</Version>
<TargetMachine>MachineX86</TargetMachine> <TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>libeay32MD.lib;ssleay32MD.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libcrypto32MD.lib;libssl32MD.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<ProjectReference> <ProjectReference>
<LinkLibraryDependencies> <LinkLibraryDependencies>
@ -168,7 +168,7 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<ShowProgress>NotSet</ShowProgress> <ShowProgress>NotSet</ShowProgress>
<Version>0.0</Version> <Version>0.0</Version>
<AdditionalDependencies>libeay32MD.lib;ssleay32MD.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>libcrypto64MD.lib;libssl64MD.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<ProjectReference> <ProjectReference>
<LinkLibraryDependencies> <LinkLibraryDependencies>

6
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 * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * 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) switch (method)
{ {
case Jupiter::SecureSocket::EncryptionMethod::SSL3: //case Jupiter::SecureSocket::EncryptionMethod::SSL3:
return SSLv3_method(); // return SSLv3_method();
case Jupiter::SecureSocket::EncryptionMethod::TLS1: case Jupiter::SecureSocket::EncryptionMethod::TLS1:
return TLSv1_method(); return TLSv1_method();
case Jupiter::SecureSocket::EncryptionMethod::TLS1_1: case Jupiter::SecureSocket::EncryptionMethod::TLS1_1:

4
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 * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -45,7 +45,7 @@ namespace Jupiter
*/ */
enum EncryptionMethod enum EncryptionMethod
{ {
SSL3 = 1, /** SSL 3.0 - Unrecommended */ //SSL3 = 1, /** SSL 3.0 - Unrecommended */
TLS1 = 2, /** TLS 1.0 - Unrecommended */ TLS1 = 2, /** TLS 1.0 - Unrecommended */
TLS1_1 = 3, /** TLS 1.1 */ TLS1_1 = 3, /** TLS 1.1 */
TLS1_2 = 4, /** TLS 1.2 */ TLS1_2 = 4, /** TLS 1.2 */

Loading…
Cancel
Save