mirror of
https://github.com/moparisthebest/curl
synced 2024-11-05 00:55:04 -05:00
39c803cba2
As of https://boringssl-review.googlesource.com/#/c/6980/, almost all of BoringSSL #ifdefs in cURL should be unnecessary: - BoringSSL provides no-op stubs for compatibility which replaces most #ifdefs. - DES_set_odd_parity has been in BoringSSL for nearly a year now. Remove the compatibility codepath. - With a small tweak to an extend_key_56_to_64 call, the NTLM code builds fine. - Switch OCSP-related #ifdefs to the more generally useful OPENSSL_NO_OCSP. The only #ifdefs which remain are Curl_ossl_version and the #undefs to work around OpenSSL and wincrypt.h name conflicts. (BoringSSL leaves that to the consumer. The in-header workaround makes things sensitive to include order.) This change errs on the side of removing conditionals despite many of the restored codepaths being no-ops. (BoringSSL generally adds no-op compatibility stubs when possible. OPENSSL_VERSION_NUMBER #ifdefs are bad enough!) Closes #640
64 lines
2.0 KiB
C
64 lines
2.0 KiB
C
/***************************************************************************
|
|
* _ _ ____ _
|
|
* Project ___| | | | _ \| |
|
|
* / __| | | | |_) | |
|
|
* | (__| |_| | _ <| |___
|
|
* \___|\___/|_| \_\_____|
|
|
*
|
|
* Copyright (C) 2015, Steve Holme, <steve_holme@hotmail.com>.
|
|
*
|
|
* This software is licensed as described in the file COPYING, which
|
|
* you should have received as part of this distribution. The terms
|
|
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
*
|
|
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
* copies of the Software, and permit persons to whom the Software is
|
|
* furnished to do so, under the terms of the COPYING file.
|
|
*
|
|
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
* KIND, either express or implied.
|
|
*
|
|
***************************************************************************/
|
|
|
|
#include "curl_setup.h"
|
|
|
|
#if defined(USE_NTLM) && !defined(USE_OPENSSL)
|
|
|
|
#include "curl_des.h"
|
|
|
|
/*
|
|
* Curl_des_set_odd_parity()
|
|
*
|
|
* This is used to apply odd parity to the given byte array. It is typically
|
|
* used by when a cryptography engines doesn't have it's own version.
|
|
*
|
|
* The function is a port of the Java based oddParity() function over at:
|
|
*
|
|
* http://davenport.sourceforge.net/ntlm.html
|
|
*
|
|
* Parameters:
|
|
*
|
|
* bytes [in/out] - The data whose parity bits are to be adjusted for
|
|
* odd parity.
|
|
* len [out] - The length of the data.
|
|
*/
|
|
void Curl_des_set_odd_parity(unsigned char *bytes, size_t len)
|
|
{
|
|
size_t i;
|
|
|
|
for(i = 0; i < len; i++) {
|
|
unsigned char b = bytes[i];
|
|
|
|
bool needs_parity = (((b >> 7) ^ (b >> 6) ^ (b >> 5) ^
|
|
(b >> 4) ^ (b >> 3) ^ (b >> 2) ^
|
|
(b >> 1)) & 0x01) == 0;
|
|
|
|
if(needs_parity)
|
|
bytes[i] |= 0x01;
|
|
else
|
|
bytes[i] &= 0xfe;
|
|
}
|
|
}
|
|
|
|
#endif /* USE_NTLM && !USE_OPENSSL */
|