Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/05: [NTOSKRNL] Don't oversize buffer for backtracking in FsRtlIsNameInExpressionPrivate
by Bartosz Brachaczek 31 Mar '19

31 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b1ae592e7fc781db39f23… commit b1ae592e7fc781db39f23a9532f535183b55c013 Author: Bartosz Brachaczek <b.brachaczek(a)gmail.com> AuthorDate: Sun Mar 31 11:15:38 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Mar 31 11:44:00 2019 +0200 [NTOSKRNL] Don't oversize buffer for backtracking in FsRtlIsNameInExpressionPrivate CORE-15902 --- ntoskrnl/fsrtl/name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ntoskrnl/fsrtl/name.c b/ntoskrnl/fsrtl/name.c index fef798cc86..a6f0c004b7 100644 --- a/ntoskrnl/fsrtl/name.c +++ b/ntoskrnl/fsrtl/name.c @@ -143,7 +143,7 @@ FsRtlIsNameInExpressionPrivate(IN PUNICODE_STRING Expression, ASSERT((OldBackTracking == BackTrackingBuffer) || (OldBackTracking == OldBackTrackingBuffer)); /* Calculate buffer size */ - BackTrackingBufferSize = (Expression->Length + 1) * 2; + BackTrackingBufferSize = Expression->Length + 1; /* Allocate memory for both back-tracking buffers */ AllocatedBuffer = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE,

1 0

[reactos] 01/05: [KMTESTS:FSRTL] Add more tests for FsRtlIsNameInExpression
by Pierre Schweitzer 31 Mar '19

31 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=180d7169e69e82582c448… commit 180d7169e69e82582c448fcbb8fc9baa36bdee88 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sun Mar 31 11:09:43 2019 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sun Mar 31 11:44:00 2019 +0200 [KMTESTS:FSRTL] Add more tests for FsRtlIsNameInExpression CORE-15902 --- modules/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c b/modules/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c index 1df0449623..dca317b9ed 100644 --- a/modules/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c +++ b/modules/rostests/kmtests/ntos_fsrtl/FsRtlExpression.c @@ -176,6 +176,9 @@ struct { L"*_MICROSOFT.WINDOWS.COMMON-CONTROLS_6595B64144CCF1DF_6.0.*.*_*_*.MANIFEST", L"X86_MICROSOFT.VC90.ATL_1FC8B3B9A1E18E3B_9.0.30729.6161_X-WW_92453BB7.CAT", FALSE, FALSE, FALSE }, + { L"FI<<<<<<<<", L"FILE", FALSE, FALSE, TRUE }, + { L"<<<<<<<<<.<", L".", FALSE, FALSE, TRUE }, + { L"F<", L"FILE.TXT", FALSE, FALSE, FALSE }, }; static VOID FsRtlIsNameInExpressionTest()

1 0

[reactos] 02/02: [MBEDTLS] Update to version 2.7.10. CORE-15895
by Thomas Faber 30 Mar '19

30 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ca86ee9c037111718c0b2… commit ca86ee9c037111718c0b2c1be284b987c445fdee Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Wed Mar 27 15:40:37 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 30 14:57:40 2019 +0100 [MBEDTLS] Update to version 2.7.10. CORE-15895 --- dll/3rdparty/mbedtls/asn1write.c | 28 ++++++----- dll/3rdparty/mbedtls/bignum.c | 38 ++++++++++----- dll/3rdparty/mbedtls/ecdsa.c | 9 +++- dll/3rdparty/mbedtls/ssl_ciphersuites.c | 57 +++++++++++++--------- dll/3rdparty/mbedtls/version_features.c | 3 ++ dll/3rdparty/mbedtls/x509_csr.c | 15 ++++-- dll/3rdparty/mbedtls/x509write_crt.c | 47 +++++++++++++++--- dll/3rdparty/mbedtls/x509write_csr.c | 36 ++++++++++++-- media/doc/3rd Party Files.txt | 2 +- sdk/include/reactos/libs/mbedtls/aesni.h | 6 +++ sdk/include/reactos/libs/mbedtls/asn1write.h | 31 +++++++----- sdk/include/reactos/libs/mbedtls/base64.h | 6 +++ sdk/include/reactos/libs/mbedtls/bn_mul.h | 8 ++- sdk/include/reactos/libs/mbedtls/ccm.h | 6 +++ sdk/include/reactos/libs/mbedtls/certs.h | 6 +++ sdk/include/reactos/libs/mbedtls/cmac.h | 6 +++ sdk/include/reactos/libs/mbedtls/compat-1.3.h | 6 +++ sdk/include/reactos/libs/mbedtls/config.h | 20 ++++++++ sdk/include/reactos/libs/mbedtls/ctr_drbg.h | 6 +++ sdk/include/reactos/libs/mbedtls/ecdh.h | 6 +++ sdk/include/reactos/libs/mbedtls/ecdsa.h | 6 +++ sdk/include/reactos/libs/mbedtls/ecjpake.h | 5 ++ sdk/include/reactos/libs/mbedtls/ecp.h | 6 +++ sdk/include/reactos/libs/mbedtls/ecp_internal.h | 6 +++ sdk/include/reactos/libs/mbedtls/error.h | 6 +++ sdk/include/reactos/libs/mbedtls/gcm.h | 6 +++ sdk/include/reactos/libs/mbedtls/havege.h | 6 +++ sdk/include/reactos/libs/mbedtls/hmac_drbg.h | 6 +++ sdk/include/reactos/libs/mbedtls/net.h | 5 ++ sdk/include/reactos/libs/mbedtls/padlock.h | 6 +++ sdk/include/reactos/libs/mbedtls/pem.h | 6 +++ sdk/include/reactos/libs/mbedtls/pkcs12.h | 6 +++ sdk/include/reactos/libs/mbedtls/pkcs5.h | 6 +++ sdk/include/reactos/libs/mbedtls/ssl_cache.h | 6 +++ .../reactos/libs/mbedtls/ssl_ciphersuites.h | 6 +++ sdk/include/reactos/libs/mbedtls/ssl_cookie.h | 6 +++ sdk/include/reactos/libs/mbedtls/ssl_internal.h | 6 +++ sdk/include/reactos/libs/mbedtls/ssl_ticket.h | 6 +++ sdk/include/reactos/libs/mbedtls/version.h | 8 +-- sdk/include/reactos/libs/mbedtls/x509_csr.h | 8 +++ 40 files changed, 384 insertions(+), 80 deletions(-) diff --git a/dll/3rdparty/mbedtls/asn1write.c b/dll/3rdparty/mbedtls/asn1write.c index bbcba87ce5..0025053cab 100644 --- a/dll/3rdparty/mbedtls/asn1write.c +++ b/dll/3rdparty/mbedtls/asn1write.c @@ -296,22 +296,28 @@ int mbedtls_asn1_write_bitstring( unsigned char **p, unsigned char *start, const unsigned char *buf, size_t bits ) { int ret; - size_t len = 0, size; + size_t len = 0; + size_t unused_bits, byte_len; - size = ( bits / 8 ) + ( ( bits % 8 ) ? 1 : 0 ); + byte_len = ( bits + 7 ) / 8; + unused_bits = ( byte_len * 8 ) - bits; - // Calculate byte length - // - if( *p < start || (size_t)( *p - start ) < size + 1 ) + if( *p < start || (size_t)( *p - start ) < byte_len + 1 ) return( MBEDTLS_ERR_ASN1_BUF_TOO_SMALL ); - len = size + 1; - (*p) -= size; - memcpy( *p, buf, size ); + len = byte_len + 1; - // Write unused bits - // - *--(*p) = (unsigned char) (size * 8 - bits); + /* Write the bitstring. Ensure the unused bits are zeroed */ + if( byte_len > 0 ) + { + byte_len--; + *--( *p ) = buf[byte_len] & ~( ( 0x1 << unused_bits ) - 1 ); + ( *p ) -= byte_len; + memcpy( *p, buf, byte_len ); + } + + /* Write unused bits */ + *--( *p ) = (unsigned char)unused_bits; MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_len( p, start, len ) ); MBEDTLS_ASN1_CHK_ADD( len, mbedtls_asn1_write_tag( p, start, MBEDTLS_ASN1_BIT_STRING ) ); diff --git a/dll/3rdparty/mbedtls/bignum.c b/dll/3rdparty/mbedtls/bignum.c index 7194bf895a..9b4eee4893 100644 --- a/dll/3rdparty/mbedtls/bignum.c +++ b/dll/3rdparty/mbedtls/bignum.c @@ -502,26 +502,38 @@ cleanup: } /* - * Helper to write the digits high-order first + * Helper to write the digits high-order first. */ -static int mpi_write_hlp( mbedtls_mpi *X, int radix, char **p ) +static int mpi_write_hlp( mbedtls_mpi *X, int radix, + char **p, const size_t buflen ) { int ret; mbedtls_mpi_uint r; + size_t length = 0; + char *p_end = *p + buflen; - if( radix < 2 || radix > 16 ) - return( MBEDTLS_ERR_MPI_BAD_INPUT_DATA ); + do + { + if( length >= buflen ) + { + return( MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL ); + } - MBEDTLS_MPI_CHK( mbedtls_mpi_mod_int( &r, X, radix ) ); - MBEDTLS_MPI_CHK( mbedtls_mpi_div_int( X, NULL, X, radix ) ); + MBEDTLS_MPI_CHK( mbedtls_mpi_mod_int( &r, X, radix ) ); + MBEDTLS_MPI_CHK( mbedtls_mpi_div_int( X, NULL, X, radix ) ); + /* + * Write the residue in the current position, as an ASCII character. + */ + if( r < 0xA ) + *(--p_end) = (char)( '0' + r ); + else + *(--p_end) = (char)( 'A' + ( r - 0xA ) ); - if( mbedtls_mpi_cmp_int( X, 0 ) != 0 ) - MBEDTLS_MPI_CHK( mpi_write_hlp( X, radix, p ) ); + length++; + } while( mbedtls_mpi_cmp_int( X, 0 ) != 0 ); - if( r < 10 ) - *(*p)++ = (char)( r + 0x30 ); - else - *(*p)++ = (char)( r + 0x37 ); + memmove( *p, p_end, length ); + *p += length; cleanup: @@ -591,7 +603,7 @@ int mbedtls_mpi_write_string( const mbedtls_mpi *X, int radix, if( T.s == -1 ) T.s = 1; - MBEDTLS_MPI_CHK( mpi_write_hlp( &T, radix, &p ) ); + MBEDTLS_MPI_CHK( mpi_write_hlp( &T, radix, &p, buflen ) ); } *p++ = '\0'; diff --git a/dll/3rdparty/mbedtls/ecdsa.c b/dll/3rdparty/mbedtls/ecdsa.c index e97e6cb433..3f2cf1d31f 100644 --- a/dll/3rdparty/mbedtls/ecdsa.c +++ b/dll/3rdparty/mbedtls/ecdsa.c @@ -422,8 +422,13 @@ cleanup: int mbedtls_ecdsa_genkey( mbedtls_ecdsa_context *ctx, mbedtls_ecp_group_id gid, int (*f_rng)(void *, unsigned char *, size_t), void *p_rng ) { - return( mbedtls_ecp_group_load( &ctx->grp, gid ) || - mbedtls_ecp_gen_keypair( &ctx->grp, &ctx->d, &ctx->Q, f_rng, p_rng ) ); + int ret = 0; + ret = mbedtls_ecp_group_load( &ctx->grp, gid ); + if( ret != 0 ) + return( ret ); + + return( mbedtls_ecp_gen_keypair( &ctx->grp, &ctx->d, + &ctx->Q, f_rng, p_rng ) ); } #endif /* MBEDTLS_ECDSA_GENKEY_ALT */ diff --git a/dll/3rdparty/mbedtls/ssl_ciphersuites.c b/dll/3rdparty/mbedtls/ssl_ciphersuites.c index b9b21ad8f2..46d9a57674 100644 --- a/dll/3rdparty/mbedtls/ssl_ciphersuites.c +++ b/dll/3rdparty/mbedtls/ssl_ciphersuites.c @@ -45,11 +45,11 @@ /* * Ordered from most preferred to least preferred in terms of security. * - * Current rule (except rc4, weak and null which come last): + * Current rule (except RC4 and 3DES, weak and null which come last): * 1. By key exchange: * Forward-secure non-PSK > forward-secure PSK > ECJPAKE > other non-PSK > other PSK * 2. By key length and cipher: - * AES-256 > Camellia-256 > AES-128 > Camellia-128 > 3DES + * AES-256 > Camellia-256 > AES-128 > Camellia-128 * 3. By cipher mode when relevant GCM > CCM > CBC > CCM_8 * 4. By hash function used when relevant * 5. By key exchange/auth again: EC > non-EC @@ -107,11 +107,6 @@ static const int ciphersuite_preference[] = MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256, MBEDTLS_TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, - /* All remaining >= 128-bit ephemeral suites */ - MBEDTLS_TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, - MBEDTLS_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, - MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA, - /* The PSK ephemeral suites */ MBEDTLS_TLS_DHE_PSK_WITH_AES_256_GCM_SHA384, MBEDTLS_TLS_DHE_PSK_WITH_AES_256_CCM, @@ -135,9 +130,6 @@ static const int ciphersuite_preference[] = MBEDTLS_TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256, MBEDTLS_TLS_DHE_PSK_WITH_AES_128_CCM_8, - MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA, - MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA, - /* The ECJPAKE suite */ MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8, @@ -185,11 +177,6 @@ static const int ciphersuite_preference[] = MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256, MBEDTLS_TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256, - /* All remaining >= 128-bit suites */ - MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA, - MBEDTLS_TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, - MBEDTLS_TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA, - /* The RSA PSK suites */ MBEDTLS_TLS_RSA_PSK_WITH_AES_256_GCM_SHA384, MBEDTLS_TLS_RSA_PSK_WITH_AES_256_CBC_SHA384, @@ -203,8 +190,6 @@ static const int ciphersuite_preference[] = MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256, MBEDTLS_TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256, - MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA, - /* The PSK suites */ MBEDTLS_TLS_PSK_WITH_AES_256_GCM_SHA384, MBEDTLS_TLS_PSK_WITH_AES_256_CCM, @@ -222,6 +207,16 @@ static const int ciphersuite_preference[] = MBEDTLS_TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256, MBEDTLS_TLS_PSK_WITH_AES_128_CCM_8, + /* 3DES suites */ + MBEDTLS_TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA, + MBEDTLS_TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA, + MBEDTLS_TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA, + MBEDTLS_TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA, + MBEDTLS_TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA, + MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA, + MBEDTLS_TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA, + MBEDTLS_TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA, + MBEDTLS_TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA, MBEDTLS_TLS_PSK_WITH_3DES_EDE_CBC_SHA, /* RC4 suites */ @@ -1706,6 +1701,26 @@ const int *mbedtls_ssl_list_ciphersuites( void ) static int supported_ciphersuites[MAX_CIPHERSUITES]; static int supported_init = 0; +static int ciphersuite_is_removed( const mbedtls_ssl_ciphersuite_t *cs_info ) +{ + (void)cs_info; + +#if defined(MBEDTLS_REMOVE_ARC4_CIPHERSUITES) + if( cs_info->cipher == MBEDTLS_CIPHER_ARC4_128 ) + return( 1 ); +#endif /* MBEDTLS_REMOVE_ARC4_CIPHERSUITES */ + +#if defined(MBEDTLS_REMOVE_3DES_CIPHERSUITES) + if( cs_info->cipher == MBEDTLS_CIPHER_DES_EDE3_ECB || + cs_info->cipher == MBEDTLS_CIPHER_DES_EDE3_CBC ) + { + return( 1 ); + } +#endif /* MBEDTLS_REMOVE_3DES_CIPHERSUITES */ + + return( 0 ); +} + const int *mbedtls_ssl_list_ciphersuites( void ) { /* @@ -1721,14 +1736,12 @@ const int *mbedtls_ssl_list_ciphersuites( void ) *p != 0 && q < supported_ciphersuites + MAX_CIPHERSUITES - 1; p++ ) { -#if defined(MBEDTLS_REMOVE_ARC4_CIPHERSUITES) const mbedtls_ssl_ciphersuite_t *cs_info; if( ( cs_info = mbedtls_ssl_ciphersuite_from_id( *p ) ) != NULL && - cs_info->cipher != MBEDTLS_CIPHER_ARC4_128 ) -#else - if( mbedtls_ssl_ciphersuite_from_id( *p ) != NULL ) -#endif + !ciphersuite_is_removed( cs_info ) ) + { *(q++) = *p; + } } *q = 0; diff --git a/dll/3rdparty/mbedtls/version_features.c b/dll/3rdparty/mbedtls/version_features.c index e4605a4f00..eaae48cce5 100644 --- a/dll/3rdparty/mbedtls/version_features.c +++ b/dll/3rdparty/mbedtls/version_features.c @@ -272,6 +272,9 @@ static const char *features[] = { #if defined(MBEDTLS_REMOVE_ARC4_CIPHERSUITES) "MBEDTLS_REMOVE_ARC4_CIPHERSUITES", #endif /* MBEDTLS_REMOVE_ARC4_CIPHERSUITES */ +#if defined(MBEDTLS_REMOVE_3DES_CIPHERSUITES) + "MBEDTLS_REMOVE_3DES_CIPHERSUITES", +#endif /* MBEDTLS_REMOVE_3DES_CIPHERSUITES */ #if defined(MBEDTLS_ECP_DP_SECP192R1_ENABLED) "MBEDTLS_ECP_DP_SECP192R1_ENABLED", #endif /* MBEDTLS_ECP_DP_SECP192R1_ENABLED */ diff --git a/dll/3rdparty/mbedtls/x509_csr.c b/dll/3rdparty/mbedtls/x509_csr.c index c153613577..7598938d0c 100644 --- a/dll/3rdparty/mbedtls/x509_csr.c +++ b/dll/3rdparty/mbedtls/x509_csr.c @@ -285,15 +285,24 @@ int mbedtls_x509_csr_parse( mbedtls_x509_csr *csr, const unsigned char *buf, siz { mbedtls_pem_init( &pem ); ret = mbedtls_pem_read_buffer( &pem, - "-----BEGIN CERTIFICATE REQUEST-----", - "-----END CERTIFICATE REQUEST-----", - buf, NULL, 0, &use_len ); + "-----BEGIN CERTIFICATE REQUEST-----", + "-----END CERTIFICATE REQUEST-----", + buf, NULL, 0, &use_len ); + if( ret == MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT ) + { + ret = mbedtls_pem_read_buffer( &pem, + "-----BEGIN NEW CERTIFICATE REQUEST-----", + "-----END NEW CERTIFICATE REQUEST-----", + buf, NULL, 0, &use_len ); + } if( ret == 0 ) + { /* * Was PEM encoded, parse the result */ ret = mbedtls_x509_csr_parse_der( csr, pem.buf, pem.buflen ); + } mbedtls_pem_free( &pem ); if( ret != MBEDTLS_ERR_PEM_NO_HEADER_FOOTER_PRESENT ) diff --git a/dll/3rdparty/mbedtls/x509write_crt.c b/dll/3rdparty/mbedtls/x509write_crt.c index 3512be5f1d..a3aeeb5edc 100644 --- a/dll/3rdparty/mbedtls/x509write_crt.c +++ b/dll/3rdparty/mbedtls/x509write_crt.c @@ -224,26 +224,51 @@ int mbedtls_x509write_crt_set_authority_key_identifier( mbedtls_x509write_cert * } #endif /* MBEDTLS_SHA1_C */ +static size_t crt_get_unused_bits_for_named_bitstring( unsigned char bitstring, + size_t bit_offset ) +{ + size_t unused_bits; + + /* Count the unused bits removing trailing 0s */ + for( unused_bits = bit_offset; unused_bits < 8; unused_bits++ ) + if( ( ( bitstring >> unused_bits ) & 0x1 ) != 0 ) + break; + + return( unused_bits ); +} + int mbedtls_x509write_crt_set_key_usage( mbedtls_x509write_cert *ctx, unsigned int key_usage ) { unsigned char buf[4], ku; unsigned char *c; int ret; - - /* We currently only support 7 bits, from 0x80 to 0x02 */ - if( ( key_usage & ~0xfe ) != 0 ) + size_t unused_bits; + const unsigned int allowed_bits = MBEDTLS_X509_KU_DIGITAL_SIGNATURE | + MBEDTLS_X509_KU_NON_REPUDIATION | + MBEDTLS_X509_KU_KEY_ENCIPHERMENT | + MBEDTLS_X509_KU_DATA_ENCIPHERMENT | + MBEDTLS_X509_KU_KEY_AGREEMENT | + MBEDTLS_X509_KU_KEY_CERT_SIGN | + MBEDTLS_X509_KU_CRL_SIGN; + + /* Check that nothing other than the allowed flags is set */ + if( ( key_usage & ~allowed_bits ) != 0 ) return( MBEDTLS_ERR_X509_FEATURE_UNAVAILABLE ); c = buf + 4; - ku = (unsigned char) key_usage; + ku = (unsigned char)key_usage; + unused_bits = crt_get_unused_bits_for_named_bitstring( ku, 1 ); + ret = mbedtls_asn1_write_bitstring( &c, buf, &ku, 8 - unused_bits ); - if( ( ret = mbedtls_asn1_write_bitstring( &c, buf, &ku, 7 ) ) != 4 ) + if( ret < 0 ) return( ret ); + else if( ret < 3 || ret > 4 ) + return( MBEDTLS_ERR_X509_INVALID_FORMAT ); ret = mbedtls_x509write_crt_set_extension( ctx, MBEDTLS_OID_KEY_USAGE, MBEDTLS_OID_SIZE( MBEDTLS_OID_KEY_USAGE ), - 1, buf, 4 ); + 1, c, (size_t)ret ); if( ret != 0 ) return( ret ); @@ -255,16 +280,22 @@ int mbedtls_x509write_crt_set_ns_cert_type( mbedtls_x509write_cert *ctx, { unsigned char buf[4]; unsigned char *c; + size_t unused_bits; int ret; c = buf + 4; - if( ( ret = mbedtls_asn1_write_bitstring( &c, buf, &ns_cert_type, 8 ) ) != 4 ) + unused_bits = crt_get_unused_bits_for_named_bitstring( ns_cert_type, 0 ); + ret = mbedtls_asn1_write_bitstring( &c, + buf, + &ns_cert_type, + 8 - unused_bits ); + if( ret < 3 || ret > 4 ) return( ret ); ret = mbedtls_x509write_crt_set_extension( ctx, MBEDTLS_OID_NS_CERT_TYPE, MBEDTLS_OID_SIZE( MBEDTLS_OID_NS_CERT_TYPE ), - 0, buf, 4 ); + 0, c, (size_t)ret ); if( ret != 0 ) return( ret ); diff --git a/dll/3rdparty/mbedtls/x509write_csr.c b/dll/3rdparty/mbedtls/x509write_csr.c index 1db31c3ef4..394fa3f3fc 100644 --- a/dll/3rdparty/mbedtls/x509write_csr.c +++ b/dll/3rdparty/mbedtls/x509write_csr.c @@ -87,20 +87,39 @@ int mbedtls_x509write_csr_set_extension( mbedtls_x509write_csr *ctx, 0, val, val_len ); } +static size_t csr_get_unused_bits_for_named_bitstring( unsigned char bitstring, + size_t bit_offset ) +{ + size_t unused_bits; + + /* Count the unused bits removing trailing 0s */ + for( unused_bits = bit_offset; unused_bits < 8; unused_bits++ ) + if( ( ( bitstring >> unused_bits ) & 0x1 ) != 0 ) + break; + + return( unused_bits ); +} + int mbedtls_x509write_csr_set_key_usage( mbedtls_x509write_csr *ctx, unsigned char key_usage ) { unsigned char buf[4]; unsigned char *c; + size_t unused_bits; int ret; c = buf + 4; - if( ( ret = mbedtls_asn1_write_bitstring( &c, buf, &key_usage, 7 ) ) != 4 ) + unused_bits = csr_get_unused_bits_for_named_bitstring( key_usage, 0 ); + ret = mbedtls_asn1_write_bitstring( &c, buf, &key_usage, 8 - unused_bits ); + + if( ret < 0 ) return( ret ); + else if( ret < 3 || ret > 4 ) + return( MBEDTLS_ERR_X509_INVALID_FORMAT ); ret = mbedtls_x509write_csr_set_extension( ctx, MBEDTLS_OID_KEY_USAGE, MBEDTLS_OID_SIZE( MBEDTLS_OID_KEY_USAGE ), - buf, 4 ); + c, (size_t)ret ); if( ret != 0 ) return( ret ); @@ -112,16 +131,25 @@ int mbedtls_x509write_csr_set_ns_cert_type( mbedtls_x509write_csr *ctx, { unsigned char buf[4]; unsigned char *c; + size_t unused_bits; int ret; c = buf + 4; - if( ( ret = mbedtls_asn1_write_bitstring( &c, buf, &ns_cert_type, 8 ) ) != 4 ) + unused_bits = csr_get_unused_bits_for_named_bitstring( ns_cert_type, 0 ); + ret = mbedtls_asn1_write_bitstring( &c, + buf, + &ns_cert_type, + 8 - unused_bits ); + + if( ret < 0 ) + return( ret ); + else if( ret < 3 || ret > 4 ) return( ret ); ret = mbedtls_x509write_csr_set_extension( ctx, MBEDTLS_OID_NS_CERT_TYPE, MBEDTLS_OID_SIZE( MBEDTLS_OID_NS_CERT_TYPE ), - buf, 4 ); + c, (size_t)ret ); if( ret != 0 ) return( ret ); diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index e82f0aff3f..eae8f6caff 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -87,7 +87,7 @@ Used Version: 4.0.10 Website: http://www.simplesystems.org/libtiff/ Title: mbed TLS -Used Version: 2.7.9 +Used Version: 2.7.10 Website: https://tls.mbed.org/ Title: libpng diff --git a/sdk/include/reactos/libs/mbedtls/aesni.h b/sdk/include/reactos/libs/mbedtls/aesni.h index 1aebdfc0e9..c2fec4da60 100644 --- a/sdk/include/reactos/libs/mbedtls/aesni.h +++ b/sdk/include/reactos/libs/mbedtls/aesni.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_AESNI_H #define MBEDTLS_AESNI_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "aes.h" #define MBEDTLS_AESNI_AES 0x02000000u diff --git a/sdk/include/reactos/libs/mbedtls/asn1write.h b/sdk/include/reactos/libs/mbedtls/asn1write.h index 0b832e5c2a..2ced49d978 100644 --- a/sdk/include/reactos/libs/mbedtls/asn1write.h +++ b/sdk/include/reactos/libs/mbedtls/asn1write.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_ASN1_WRITE_H #define MBEDTLS_ASN1_WRITE_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "asn1.h" #define MBEDTLS_ASN1_CHK_ADD(g, f) do { if( ( ret = f ) < 0 ) return( ret ); else \ @@ -185,24 +191,27 @@ int mbedtls_asn1_write_ia5_string( unsigned char **p, unsigned char *start, const char *text, size_t text_len ); /** - * \brief Write a bitstring tag (MBEDTLS_ASN1_BIT_STRING) and - * value in ASN.1 format - * Note: function works backwards in data buffer + * \brief Write a bitstring tag (#MBEDTLS_ASN1_BIT_STRING) and + * value in ASN.1 format. * - * \param p reference to current position pointer - * \param start start of the buffer (for bounds-checking) - * \param buf the bitstring - * \param bits the total number of bits in the bitstring + * \note This function works backwards in data buffer. * - * \return the length written or a negative error code + * \param p The reference to the current position pointer. + * \param start The start of the buffer, for bounds-checking. + * \param buf The bitstring to write. + * \param bits The total number of bits in the bitstring. + * + * \return The number of bytes written to \p p on success. + * \return A negative error code on failure. */ int mbedtls_asn1_write_bitstring( unsigned char **p, unsigned char *start, const unsigned char *buf, size_t bits ); /** - * \brief Write an octet string tag (MBEDTLS_ASN1_OCTET_STRING) and - * value in ASN.1 format - * Note: function works backwards in data buffer + * \brief Write an octet string tag (#MBEDTLS_ASN1_OCTET_STRING) + * and value in ASN.1 format. + * + * \note This function works backwards in data buffer. * * \param p reference to current position pointer * \param start start of the buffer (for bounds-checking) diff --git a/sdk/include/reactos/libs/mbedtls/base64.h b/sdk/include/reactos/libs/mbedtls/base64.h index ce5563e1d4..478a3d6f24 100644 --- a/sdk/include/reactos/libs/mbedtls/base64.h +++ b/sdk/include/reactos/libs/mbedtls/base64.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_BASE64_H #define MBEDTLS_BASE64_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include <stddef.h> #define MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL -0x002A /**< Output buffer too small. */ diff --git a/sdk/include/reactos/libs/mbedtls/bn_mul.h b/sdk/include/reactos/libs/mbedtls/bn_mul.h index 34ff50fb07..b5bbd71dc3 100644 --- a/sdk/include/reactos/libs/mbedtls/bn_mul.h +++ b/sdk/include/reactos/libs/mbedtls/bn_mul.h @@ -40,6 +40,12 @@ #ifndef MBEDTLS_BN_MUL_H #define MBEDTLS_BN_MUL_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "bignum.h" #if defined(MBEDTLS_HAVE_ASM) @@ -736,7 +742,7 @@ "sw $10, %2 \n\t" \ : "=m" (c), "=m" (d), "=m" (s) \ : "m" (s), "m" (d), "m" (c), "m" (b) \ - : "$9", "$10", "$11", "$12", "$13", "$14", "$15" \ + : "$9", "$10", "$11", "$12", "$13", "$14", "$15", "lo", "hi" \ ); #endif /* MIPS */ diff --git a/sdk/include/reactos/libs/mbedtls/ccm.h b/sdk/include/reactos/libs/mbedtls/ccm.h index 435009a7a1..f826b4491e 100644 --- a/sdk/include/reactos/libs/mbedtls/ccm.h +++ b/sdk/include/reactos/libs/mbedtls/ccm.h @@ -36,6 +36,12 @@ #ifndef MBEDTLS_CCM_H #define MBEDTLS_CCM_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "cipher.h" #define MBEDTLS_ERR_CCM_BAD_INPUT -0x000D /**< Bad input parameters to the function. */ diff --git a/sdk/include/reactos/libs/mbedtls/certs.h b/sdk/include/reactos/libs/mbedtls/certs.h index ae0f84a307..31a6e86bba 100644 --- a/sdk/include/reactos/libs/mbedtls/certs.h +++ b/sdk/include/reactos/libs/mbedtls/certs.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_CERTS_H #define MBEDTLS_CERTS_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include <stddef.h> #ifdef __cplusplus diff --git a/sdk/include/reactos/libs/mbedtls/cmac.h b/sdk/include/reactos/libs/mbedtls/cmac.h index 7ab0c1056b..e0c23cb55e 100644 --- a/sdk/include/reactos/libs/mbedtls/cmac.h +++ b/sdk/include/reactos/libs/mbedtls/cmac.h @@ -28,6 +28,12 @@ #ifndef MBEDTLS_CMAC_H #define MBEDTLS_CMAC_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "cipher.h" #ifdef __cplusplus diff --git a/sdk/include/reactos/libs/mbedtls/compat-1.3.h b/sdk/include/reactos/libs/mbedtls/compat-1.3.h index 21ded5db82..45647b0393 100644 --- a/sdk/include/reactos/libs/mbedtls/compat-1.3.h +++ b/sdk/include/reactos/libs/mbedtls/compat-1.3.h @@ -27,6 +27,12 @@ * This file is part of mbed TLS (https://tls.mbed.org) */ +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #if ! defined(MBEDTLS_DEPRECATED_REMOVED) #if defined(MBEDTLS_DEPRECATED_WARNING) diff --git a/sdk/include/reactos/libs/mbedtls/config.h b/sdk/include/reactos/libs/mbedtls/config.h index 912b5564c5..4e78b52b6d 100644 --- a/sdk/include/reactos/libs/mbedtls/config.h +++ b/sdk/include/reactos/libs/mbedtls/config.h @@ -558,6 +558,26 @@ */ #define MBEDTLS_REMOVE_ARC4_CIPHERSUITES +/** + * \def MBEDTLS_REMOVE_3DES_CIPHERSUITES + * + * Remove 3DES ciphersuites by default in SSL / TLS. + * This flag removes the ciphersuites based on 3DES from the default list as + * returned by mbedtls_ssl_list_ciphersuites(). However, it is still possible + * to enable (some of) them with mbedtls_ssl_conf_ciphersuites() by including + * them explicitly. + * + * A man-in-the-browser attacker can recover authentication tokens sent through + * a TLS connection using a 3DES based cipher suite (see "On the Practical + * (In-)Security of 64-bit Block Ciphers" by Karthikeyan Bhargavan and Gaëtan + * Leurent, see https://sweet32.info/SWEET32_CCS16.pdf). If this attack falls + * in your threat model or you are unsure, then you should keep this option + * enabled to remove 3DES based cipher suites. + * + * Comment this macro to keep 3DES in the default ciphersuite list. + */ +#define MBEDTLS_REMOVE_3DES_CIPHERSUITES + /** * \def MBEDTLS_ECP_DP_SECP192R1_ENABLED * diff --git a/sdk/include/reactos/libs/mbedtls/ctr_drbg.h b/sdk/include/reactos/libs/mbedtls/ctr_drbg.h index dedce771a9..eec3f7c888 100644 --- a/sdk/include/reactos/libs/mbedtls/ctr_drbg.h +++ b/sdk/include/reactos/libs/mbedtls/ctr_drbg.h @@ -30,6 +30,12 @@ #ifndef MBEDTLS_CTR_DRBG_H #define MBEDTLS_CTR_DRBG_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "aes.h" #if defined(MBEDTLS_THREADING_C) diff --git a/sdk/include/reactos/libs/mbedtls/ecdh.h b/sdk/include/reactos/libs/mbedtls/ecdh.h index d5bc59f5a4..6cfa7119cb 100644 --- a/sdk/include/reactos/libs/mbedtls/ecdh.h +++ b/sdk/include/reactos/libs/mbedtls/ecdh.h @@ -35,6 +35,12 @@ #ifndef MBEDTLS_ECDH_H #define MBEDTLS_ECDH_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "ecp.h" #ifdef __cplusplus diff --git a/sdk/include/reactos/libs/mbedtls/ecdsa.h b/sdk/include/reactos/libs/mbedtls/ecdsa.h index 68b4931f44..9659bc07f2 100644 --- a/sdk/include/reactos/libs/mbedtls/ecdsa.h +++ b/sdk/include/reactos/libs/mbedtls/ecdsa.h @@ -33,6 +33,12 @@ #ifndef MBEDTLS_ECDSA_H #define MBEDTLS_ECDSA_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "ecp.h" #include "md.h" diff --git a/sdk/include/reactos/libs/mbedtls/ecjpake.h b/sdk/include/reactos/libs/mbedtls/ecjpake.h index 2107f31a62..fca0477422 100644 --- a/sdk/include/reactos/libs/mbedtls/ecjpake.h +++ b/sdk/include/reactos/libs/mbedtls/ecjpake.h @@ -42,6 +42,11 @@ * The payloads are serialized in a way suitable for use in TLS, but could * also be use outside TLS. */ +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif #include "ecp.h" #include "md.h" diff --git a/sdk/include/reactos/libs/mbedtls/ecp.h b/sdk/include/reactos/libs/mbedtls/ecp.h index 2d0ddcf75c..adac0b2dc0 100644 --- a/sdk/include/reactos/libs/mbedtls/ecp.h +++ b/sdk/include/reactos/libs/mbedtls/ecp.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_ECP_H #define MBEDTLS_ECP_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "bignum.h" /* diff --git a/sdk/include/reactos/libs/mbedtls/ecp_internal.h b/sdk/include/reactos/libs/mbedtls/ecp_internal.h index 73bccd4269..70afecdf10 100644 --- a/sdk/include/reactos/libs/mbedtls/ecp_internal.h +++ b/sdk/include/reactos/libs/mbedtls/ecp_internal.h @@ -63,6 +63,12 @@ #ifndef MBEDTLS_ECP_INTERNAL_H #define MBEDTLS_ECP_INTERNAL_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #if defined(MBEDTLS_ECP_INTERNAL_ALT) /** diff --git a/sdk/include/reactos/libs/mbedtls/error.h b/sdk/include/reactos/libs/mbedtls/error.h index cb0548ba78..363675709d 100644 --- a/sdk/include/reactos/libs/mbedtls/error.h +++ b/sdk/include/reactos/libs/mbedtls/error.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_ERROR_H #define MBEDTLS_ERROR_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include <stddef.h> /** diff --git a/sdk/include/reactos/libs/mbedtls/gcm.h b/sdk/include/reactos/libs/mbedtls/gcm.h index 081c1f1a68..5778d3fbb9 100644 --- a/sdk/include/reactos/libs/mbedtls/gcm.h +++ b/sdk/include/reactos/libs/mbedtls/gcm.h @@ -33,6 +33,12 @@ #ifndef MBEDTLS_GCM_H #define MBEDTLS_GCM_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "cipher.h" #include <stdint.h> diff --git a/sdk/include/reactos/libs/mbedtls/havege.h b/sdk/include/reactos/libs/mbedtls/havege.h index 34229e6265..37ccfe3568 100644 --- a/sdk/include/reactos/libs/mbedtls/havege.h +++ b/sdk/include/reactos/libs/mbedtls/havege.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_HAVEGE_H #define MBEDTLS_HAVEGE_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include <stddef.h> #define MBEDTLS_HAVEGE_COLLECT_SIZE 1024 diff --git a/sdk/include/reactos/libs/mbedtls/hmac_drbg.h b/sdk/include/reactos/libs/mbedtls/hmac_drbg.h index 91b1dbda9e..71f6c35812 100644 --- a/sdk/include/reactos/libs/mbedtls/hmac_drbg.h +++ b/sdk/include/reactos/libs/mbedtls/hmac_drbg.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_HMAC_DRBG_H #define MBEDTLS_HMAC_DRBG_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "md.h" #if defined(MBEDTLS_THREADING_C) diff --git a/sdk/include/reactos/libs/mbedtls/net.h b/sdk/include/reactos/libs/mbedtls/net.h index 84d2955dc3..c18671259c 100644 --- a/sdk/include/reactos/libs/mbedtls/net.h +++ b/sdk/include/reactos/libs/mbedtls/net.h @@ -25,6 +25,11 @@ * * This file is part of mbed TLS (https://tls.mbed.org) */ +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif #if !defined(MBEDTLS_DEPRECATED_REMOVED) #include "net_sockets.h" diff --git a/sdk/include/reactos/libs/mbedtls/padlock.h b/sdk/include/reactos/libs/mbedtls/padlock.h index 705a812cb9..9333119aae 100644 --- a/sdk/include/reactos/libs/mbedtls/padlock.h +++ b/sdk/include/reactos/libs/mbedtls/padlock.h @@ -27,6 +27,12 @@ #ifndef MBEDTLS_PADLOCK_H #define MBEDTLS_PADLOCK_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "aes.h" #define MBEDTLS_ERR_PADLOCK_DATA_MISALIGNED -0x0030 /**< Input data should be aligned. */ diff --git a/sdk/include/reactos/libs/mbedtls/pem.h b/sdk/include/reactos/libs/mbedtls/pem.h index 06a648371e..6e8443359a 100644 --- a/sdk/include/reactos/libs/mbedtls/pem.h +++ b/sdk/include/reactos/libs/mbedtls/pem.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_PEM_H #define MBEDTLS_PEM_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include <stddef.h> /** diff --git a/sdk/include/reactos/libs/mbedtls/pkcs12.h b/sdk/include/reactos/libs/mbedtls/pkcs12.h index 1b6f449a0b..86b85125ae 100644 --- a/sdk/include/reactos/libs/mbedtls/pkcs12.h +++ b/sdk/include/reactos/libs/mbedtls/pkcs12.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_PKCS12_H #define MBEDTLS_PKCS12_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "md.h" #include "cipher.h" #include "asn1.h" diff --git a/sdk/include/reactos/libs/mbedtls/pkcs5.h b/sdk/include/reactos/libs/mbedtls/pkcs5.h index ffd729fdac..c936c032ed 100644 --- a/sdk/include/reactos/libs/mbedtls/pkcs5.h +++ b/sdk/include/reactos/libs/mbedtls/pkcs5.h @@ -28,6 +28,12 @@ #ifndef MBEDTLS_PKCS5_H #define MBEDTLS_PKCS5_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "asn1.h" #include "md.h" diff --git a/sdk/include/reactos/libs/mbedtls/ssl_cache.h b/sdk/include/reactos/libs/mbedtls/ssl_cache.h index 3252075e07..0a9367c61c 100644 --- a/sdk/include/reactos/libs/mbedtls/ssl_cache.h +++ b/sdk/include/reactos/libs/mbedtls/ssl_cache.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_SSL_CACHE_H #define MBEDTLS_SSL_CACHE_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "ssl.h" #if defined(MBEDTLS_THREADING_C) diff --git a/sdk/include/reactos/libs/mbedtls/ssl_ciphersuites.h b/sdk/include/reactos/libs/mbedtls/ssl_ciphersuites.h index d7bc190ed1..05d8ebbce8 100644 --- a/sdk/include/reactos/libs/mbedtls/ssl_ciphersuites.h +++ b/sdk/include/reactos/libs/mbedtls/ssl_ciphersuites.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_SSL_CIPHERSUITES_H #define MBEDTLS_SSL_CIPHERSUITES_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "pk.h" #include "cipher.h" #include "md.h" diff --git a/sdk/include/reactos/libs/mbedtls/ssl_cookie.h b/sdk/include/reactos/libs/mbedtls/ssl_cookie.h index edd9351678..9f846c3e2b 100644 --- a/sdk/include/reactos/libs/mbedtls/ssl_cookie.h +++ b/sdk/include/reactos/libs/mbedtls/ssl_cookie.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_SSL_COOKIE_H #define MBEDTLS_SSL_COOKIE_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "ssl.h" #if defined(MBEDTLS_THREADING_C) diff --git a/sdk/include/reactos/libs/mbedtls/ssl_internal.h b/sdk/include/reactos/libs/mbedtls/ssl_internal.h index 75611fd767..44a6caff67 100644 --- a/sdk/include/reactos/libs/mbedtls/ssl_internal.h +++ b/sdk/include/reactos/libs/mbedtls/ssl_internal.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_SSL_INTERNAL_H #define MBEDTLS_SSL_INTERNAL_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + #include "ssl.h" #include "cipher.h" diff --git a/sdk/include/reactos/libs/mbedtls/ssl_ticket.h b/sdk/include/reactos/libs/mbedtls/ssl_ticket.h index c4ae9df484..ffdc49616d 100644 --- a/sdk/include/reactos/libs/mbedtls/ssl_ticket.h +++ b/sdk/include/reactos/libs/mbedtls/ssl_ticket.h @@ -26,6 +26,12 @@ #ifndef MBEDTLS_SSL_TICKET_H #define MBEDTLS_SSL_TICKET_H +#if !defined(MBEDTLS_CONFIG_FILE) +#include "config.h" +#else +#include MBEDTLS_CONFIG_FILE +#endif + /* * This implementation of the session ticket callbacks includes key * management, rotating the keys periodically in order to preserve forward diff --git a/sdk/include/reactos/libs/mbedtls/version.h b/sdk/include/reactos/libs/mbedtls/version.h index ea1568fbdb..b0d49d21c4 100644 --- a/sdk/include/reactos/libs/mbedtls/version.h +++ b/sdk/include/reactos/libs/mbedtls/version.h @@ -42,16 +42,16 @@ */ #define MBEDTLS_VERSION_MAJOR 2 #define MBEDTLS_VERSION_MINOR 7 -#define MBEDTLS_VERSION_PATCH 9 +#define MBEDTLS_VERSION_PATCH 10 /** * The single version number has the following structure: * MMNNPP00 * Major version | Minor version | Patch version */ -#define MBEDTLS_VERSION_NUMBER 0x02070900 -#define MBEDTLS_VERSION_STRING "2.7.9" -#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.7.9" +#define MBEDTLS_VERSION_NUMBER 0x02070A00 +#define MBEDTLS_VERSION_STRING "2.7.10" +#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.7.10" #if defined(MBEDTLS_VERSION_C) diff --git a/sdk/include/reactos/libs/mbedtls/x509_csr.h b/sdk/include/reactos/libs/mbedtls/x509_csr.h index 82a24c548d..9acbe243a0 100644 --- a/sdk/include/reactos/libs/mbedtls/x509_csr.h +++ b/sdk/include/reactos/libs/mbedtls/x509_csr.h @@ -207,6 +207,14 @@ void mbedtls_x509write_csr_set_md_alg( mbedtls_x509write_csr *ctx, mbedtls_md_ty * \param key_usage key usage flags to set * * \return 0 if successful, or MBEDTLS_ERR_X509_ALLOC_FAILED + * + * \note The <code>decipherOnly</code> flag from the Key Usage + * extension is represented by bit 8 (i.e. + * <code>0x8000</code>), which cannot typically be represented + * in an unsigned char. Therefore, the flag + * <code>decipherOnly</code> (i.e. + * #MBEDTLS_X509_KU_DECIPHER_ONLY) cannot be set using this + * function. */ int mbedtls_x509write_csr_set_key_usage( mbedtls_x509write_csr *ctx, unsigned char key_usage );

1 0

[reactos] 01/02: [ACPICA] Update to version 20190329. CORE-15900
by Thomas Faber 30 Mar '19

30 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba1fb9ace9628d867abbf… commit ba1fb9ace9628d867abbf83bb32f755bb05c961b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Mar 30 11:18:50 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 30 14:57:35 2019 +0100 [ACPICA] Update to version 20190329. CORE-15900 --- drivers/bus/acpi/acpica/dispatcher/dsfield.c | 2 +- drivers/bus/acpi/acpica/dispatcher/dsinit.c | 2 +- drivers/bus/acpi/acpica/events/evgpeinit.c | 4 ++-- drivers/bus/acpi/acpica/executer/exnames.c | 6 ++--- drivers/bus/acpi/acpica/include/aclocal.h | 4 ++-- drivers/bus/acpi/acpica/include/acpixf.h | 2 +- drivers/bus/acpi/acpica/include/actbl.h | 4 ++-- drivers/bus/acpi/acpica/include/actypes.h | 12 +++++----- drivers/bus/acpi/acpica/include/platform/aclinux.h | 5 +++++ drivers/bus/acpi/acpica/namespace/nsaccess.c | 2 +- drivers/bus/acpi/acpica/namespace/nsdump.c | 2 +- drivers/bus/acpi/acpica/namespace/nsinit.c | 4 ++-- drivers/bus/acpi/acpica/namespace/nsnames.c | 8 +++---- drivers/bus/acpi/acpica/namespace/nsobject.c | 5 +++++ drivers/bus/acpi/acpica/namespace/nsparse.c | 2 +- drivers/bus/acpi/acpica/namespace/nsrepair.c | 2 +- drivers/bus/acpi/acpica/namespace/nsrepair2.c | 4 ++-- drivers/bus/acpi/acpica/namespace/nsutils.c | 12 +++++----- drivers/bus/acpi/acpica/namespace/nsxfname.c | 4 ++-- drivers/bus/acpi/acpica/parser/psargs.c | 8 +++---- drivers/bus/acpi/acpica/resources/rsxface.c | 8 +++---- drivers/bus/acpi/acpica/tables/tbdata.c | 2 +- drivers/bus/acpi/acpica/tables/tbfind.c | 6 ++--- drivers/bus/acpi/acpica/tables/tbinstal.c | 2 +- drivers/bus/acpi/acpica/tables/tbprint.c | 10 ++++----- drivers/bus/acpi/acpica/tables/tbutils.c | 2 +- drivers/bus/acpi/acpica/tables/tbxface.c | 4 ++-- drivers/bus/acpi/acpica/tables/tbxfload.c | 10 ++++----- drivers/bus/acpi/acpica/utilities/utascii.c | 2 +- drivers/bus/acpi/acpica/utilities/utdecode.c | 26 +++++++++++----------- drivers/bus/acpi/acpica/utilities/utmisc.c | 8 +++---- drivers/bus/acpi/acpica/utilities/utpredef.c | 4 ++-- drivers/bus/acpi/acpica/utilities/utstring.c | 6 ++--- media/doc/3rd Party Files.txt | 2 +- 34 files changed, 98 insertions(+), 88 deletions(-) diff --git a/drivers/bus/acpi/acpica/dispatcher/dsfield.c b/drivers/bus/acpi/acpica/dispatcher/dsfield.c index ec1c125449..43c1fe4fa1 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsfield.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsfield.c @@ -577,7 +577,7 @@ AcpiDsCreateField ( Info.RegionNode = RegionNode; Status = AcpiDsGetFieldNames (&Info, WalkState, Arg->Common.Next); - if (Info.RegionNode->Type == ACPI_ADR_SPACE_PLATFORM_COMM && + if (Info.RegionNode->Object->Region.SpaceId == ACPI_ADR_SPACE_PLATFORM_COMM && !(RegionNode->Object->Field.InternalPccBuffer = ACPI_ALLOCATE_ZEROED(Info.RegionNode->Object->Region.Length))) { diff --git a/drivers/bus/acpi/acpica/dispatcher/dsinit.c b/drivers/bus/acpi/acpica/dispatcher/dsinit.c index b1300b7e82..8db132d5ad 100644 --- a/drivers/bus/acpi/acpica/dispatcher/dsinit.c +++ b/drivers/bus/acpi/acpica/dispatcher/dsinit.c @@ -251,7 +251,7 @@ AcpiDsInitializeObjects ( /* DSDT is always the first AML table */ - if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT)) + if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_DSDT)) { ACPI_DEBUG_PRINT_RAW ((ACPI_DB_INIT, "\nInitializing Namespace objects:\n")); diff --git a/drivers/bus/acpi/acpica/events/evgpeinit.c b/drivers/bus/acpi/acpica/events/evgpeinit.c index ccdcff2a3c..9b2d5ce928 100644 --- a/drivers/bus/acpi/acpica/events/evgpeinit.c +++ b/drivers/bus/acpi/acpica/events/evgpeinit.c @@ -339,7 +339,7 @@ AcpiEvMatchGpeMethod ( ACPI_STATUS Status; UINT32 GpeNumber; UINT8 TempGpeNumber; - char Name[ACPI_NAME_SIZE + 1]; + char Name[ACPI_NAMESEG_SIZE + 1]; UINT8 Type; @@ -360,7 +360,7 @@ AcpiEvMatchGpeMethod ( * 1) Extract the method name and null terminate it */ ACPI_MOVE_32_TO_32 (Name, &MethodNode->Name.Integer); - Name[ACPI_NAME_SIZE] = 0; + Name[ACPI_NAMESEG_SIZE] = 0; /* 2) Name must begin with an underscore */ diff --git a/drivers/bus/acpi/acpica/executer/exnames.c b/drivers/bus/acpi/acpica/executer/exnames.c index f730df2e21..a29901fc8c 100644 --- a/drivers/bus/acpi/acpica/executer/exnames.c +++ b/drivers/bus/acpi/acpica/executer/exnames.c @@ -99,11 +99,11 @@ AcpiExAllocateNameString ( { /* Special case for root */ - SizeNeeded = 1 + (ACPI_NAME_SIZE * NumNameSegs) + 2 + 1; + SizeNeeded = 1 + (ACPI_NAMESEG_SIZE * NumNameSegs) + 2 + 1; } else { - SizeNeeded = PrefixCount + (ACPI_NAME_SIZE * NumNameSegs) + 2 + 1; + SizeNeeded = PrefixCount + (ACPI_NAMESEG_SIZE * NumNameSegs) + 2 + 1; } /* @@ -202,7 +202,7 @@ AcpiExNameSegment ( } for (Index = 0; - (Index < ACPI_NAME_SIZE) && (AcpiUtValidNameChar (*AmlAddress, 0)); + (Index < ACPI_NAMESEG_SIZE) && (AcpiUtValidNameChar (*AmlAddress, 0)); Index++) { CharBuf[Index] = *AmlAddress++; diff --git a/drivers/bus/acpi/acpica/include/aclocal.h b/drivers/bus/acpi/acpica/include/aclocal.h index bd0a25d6d4..0d683460f9 100644 --- a/drivers/bus/acpi/acpica/include/aclocal.h +++ b/drivers/bus/acpi/acpica/include/aclocal.h @@ -372,7 +372,7 @@ ACPI_STATUS (*ACPI_INTERNAL_METHOD) ( */ typedef struct acpi_name_info { - char Name[ACPI_NAME_SIZE]; + char Name[ACPI_NAMESEG_SIZE]; UINT16 ArgumentList; UINT8 ExpectedBtypes; @@ -460,7 +460,7 @@ typedef ACPI_STATUS (*ACPI_OBJECT_CONVERTER) ( typedef struct acpi_simple_repair_info { - char Name[ACPI_NAME_SIZE]; + char Name[ACPI_NAMESEG_SIZE]; UINT32 UnexpectedBtypes; UINT32 PackageIndex; ACPI_OBJECT_CONVERTER ObjectConverter; diff --git a/drivers/bus/acpi/acpica/include/acpixf.h b/drivers/bus/acpi/acpica/include/acpixf.h index ba6b8bba90..d700786dc3 100644 --- a/drivers/bus/acpi/acpica/include/acpixf.h +++ b/drivers/bus/acpi/acpica/include/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20190215 +#define ACPI_CA_VERSION 0x20190329 #include "acconfig.h" #include "actypes.h" diff --git a/drivers/bus/acpi/acpica/include/actbl.h b/drivers/bus/acpi/acpica/include/actbl.h index 55d4b4826c..e65adcbc29 100644 --- a/drivers/bus/acpi/acpica/include/actbl.h +++ b/drivers/bus/acpi/acpica/include/actbl.h @@ -105,14 +105,14 @@ typedef struct acpi_table_header { - char Signature[ACPI_NAME_SIZE]; /* ASCII table signature */ + char Signature[ACPI_NAMESEG_SIZE]; /* ASCII table signature */ UINT32 Length; /* Length of table in bytes, including this header */ UINT8 Revision; /* ACPI Specification minor version number */ UINT8 Checksum; /* To make sum of entire table == 0 */ char OemId[ACPI_OEM_ID_SIZE]; /* ASCII OEM identification */ char OemTableId[ACPI_OEM_TABLE_ID_SIZE]; /* ASCII OEM table identification */ UINT32 OemRevision; /* OEM revision number */ - char AslCompilerId[ACPI_NAME_SIZE]; /* ASCII ASL compiler vendor ID */ + char AslCompilerId[ACPI_NAMESEG_SIZE]; /* ASCII ASL compiler vendor ID */ UINT32 AslCompilerRevision; /* ASL compiler version */ } ACPI_TABLE_HEADER; diff --git a/drivers/bus/acpi/acpica/include/actypes.h b/drivers/bus/acpi/acpica/include/actypes.h index b7c645f813..48a192a5b8 100644 --- a/drivers/bus/acpi/acpica/include/actypes.h +++ b/drivers/bus/acpi/acpica/include/actypes.h @@ -412,7 +412,7 @@ typedef UINT64 ACPI_PHYSICAL_ADDRESS; /* Names within the namespace are 4 bytes long */ -#define ACPI_NAME_SIZE 4 +#define ACPI_NAMESEG_SIZE 4 /* Fixed by ACPI spec */ #define ACPI_PATH_SEGMENT_LENGTH 5 /* 4 chars for name + 1 char for separator */ #define ACPI_PATH_SEPARATOR '.' @@ -558,11 +558,11 @@ typedef UINT64 ACPI_INTEGER; /* Optimizations for 4-character (32-bit) ACPI_NAME manipulation */ #ifndef ACPI_MISALIGNMENT_NOT_SUPPORTED -#define ACPI_COMPARE_NAME(a,b) (*ACPI_CAST_PTR (UINT32, (a)) == *ACPI_CAST_PTR (UINT32, (b))) -#define ACPI_MOVE_NAME(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src))) +#define ACPI_COMPARE_NAMESEG(a,b) (*ACPI_CAST_PTR (UINT32, (a)) == *ACPI_CAST_PTR (UINT32, (b))) +#define ACPI_COPY_NAMESEG(dest,src) (*ACPI_CAST_PTR (UINT32, (dest)) = *ACPI_CAST_PTR (UINT32, (src))) #else -#define ACPI_COMPARE_NAME(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAME_SIZE)) -#define ACPI_MOVE_NAME(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAME_SIZE)) +#define ACPI_COMPARE_NAMESEG(a,b) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_CAST_PTR (char, (b)), ACPI_NAMESEG_SIZE)) +#define ACPI_COPY_NAMESEG(dest,src) (strncpy (ACPI_CAST_PTR (char, (dest)), ACPI_CAST_PTR (char, (src)), ACPI_NAMESEG_SIZE)) #endif /* Support for the special RSDP signature (8 characters) */ @@ -572,7 +572,7 @@ typedef UINT64 ACPI_INTEGER; /* Support for OEMx signature (x can be any character) */ #define ACPI_IS_OEM_SIG(a) (!strncmp (ACPI_CAST_PTR (char, (a)), ACPI_OEM_NAME, 3) &&\ - strnlen (a, ACPI_NAME_SIZE) == ACPI_NAME_SIZE) + strnlen (a, ACPI_NAMESEG_SIZE) == ACPI_NAMESEG_SIZE) /* * Algorithm to obtain access bit width. diff --git a/drivers/bus/acpi/acpica/include/platform/aclinux.h b/drivers/bus/acpi/acpica/include/platform/aclinux.h index c93548b94c..0e7fe9de00 100644 --- a/drivers/bus/acpi/acpica/include/platform/aclinux.h +++ b/drivers/bus/acpi/acpica/include/platform/aclinux.h @@ -113,6 +113,11 @@ #define ACPI_NO_ERROR_MESSAGES #undef ACPI_DEBUG_OUTPUT +/* Use a specific bugging default separate from ACPICA */ + +#undef ACPI_DEBUG_DEFAULT +#define ACPI_DEBUG_DEFAULT (ACPI_LV_INFO | ACPI_LV_REPAIR) + /* External interface for __KERNEL__, stub is needed */ #define ACPI_EXTERNAL_RETURN_STATUS(Prototype) \ diff --git a/drivers/bus/acpi/acpica/namespace/nsaccess.c b/drivers/bus/acpi/acpica/namespace/nsaccess.c index 59121b7b82..949e2e11b3 100644 --- a/drivers/bus/acpi/acpica/namespace/nsaccess.c +++ b/drivers/bus/acpi/acpica/namespace/nsaccess.c @@ -743,7 +743,7 @@ AcpiNsLookup ( /* Point to next name segment and make this node current */ - Path += ACPI_NAME_SIZE; + Path += ACPI_NAMESEG_SIZE; CurrentNode = ThisNode; } diff --git a/drivers/bus/acpi/acpica/namespace/nsdump.c b/drivers/bus/acpi/acpica/namespace/nsdump.c index 051f7dfeb5..cf03a110f3 100644 --- a/drivers/bus/acpi/acpica/namespace/nsdump.c +++ b/drivers/bus/acpi/acpica/namespace/nsdump.c @@ -127,7 +127,7 @@ AcpiNsPrintPathname ( AcpiOsPrintf ("?"); } - Pathname += ACPI_NAME_SIZE; + Pathname += ACPI_NAMESEG_SIZE; NumSegments--; if (NumSegments) { diff --git a/drivers/bus/acpi/acpica/namespace/nsinit.c b/drivers/bus/acpi/acpica/namespace/nsinit.c index 9dac9d5a32..5866479d5a 100644 --- a/drivers/bus/acpi/acpica/namespace/nsinit.c +++ b/drivers/bus/acpi/acpica/namespace/nsinit.c @@ -554,7 +554,7 @@ AcpiNsFindIniMethods ( /* We are only looking for methods named _INI */ - if (!ACPI_COMPARE_NAME (Node->Name.Ascii, METHOD_NAME__INI)) + if (!ACPI_COMPARE_NAMESEG (Node->Name.Ascii, METHOD_NAME__INI)) { return (AE_OK); } @@ -731,7 +731,7 @@ AcpiNsInitOneDevice ( * Note: We know there is an _INI within this subtree, but it may not be * under this particular device, it may be lower in the branch. */ - if (!ACPI_COMPARE_NAME (DeviceNode->Name.Ascii, "_SB_") || + if (!ACPI_COMPARE_NAMESEG (DeviceNode->Name.Ascii, "_SB_") || DeviceNode->Parent != AcpiGbl_RootNode) { ACPI_DEBUG_EXEC (AcpiUtDisplayInitPathname ( diff --git a/drivers/bus/acpi/acpica/namespace/nsnames.c b/drivers/bus/acpi/acpica/namespace/nsnames.c index 847b59f000..6ab5cc6443 100644 --- a/drivers/bus/acpi/acpica/namespace/nsnames.c +++ b/drivers/bus/acpi/acpica/namespace/nsnames.c @@ -165,8 +165,8 @@ AcpiNsHandleToName ( /* Just copy the ACPI name from the Node and zero terminate it */ NodeName = AcpiUtGetNodeName (Node); - ACPI_MOVE_NAME (Buffer->Pointer, NodeName); - ((char *) Buffer->Pointer) [ACPI_NAME_SIZE] = 0; + ACPI_COPY_NAMESEG (Buffer->Pointer, NodeName); + ((char *) Buffer->Pointer) [ACPI_NAMESEG_SIZE] = 0; ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, "%4.4s\n", (char *) Buffer->Pointer)); return_ACPI_STATUS (AE_OK); @@ -266,7 +266,7 @@ AcpiNsBuildNormalizedPath ( BOOLEAN NoTrailing) { UINT32 Length = 0, i; - char Name[ACPI_NAME_SIZE]; + char Name[ACPI_NAMESEG_SIZE]; BOOLEAN DoNoTrailing; char c, *Left, *Right; ACPI_NAMESPACE_NODE *NextNode; @@ -549,7 +549,7 @@ AcpiNsNormalizePathname ( { /* Do one nameseg at a time */ - for (i = 0; (i < ACPI_NAME_SIZE) && *InputPath; i++) + for (i = 0; (i < ACPI_NAMESEG_SIZE) && *InputPath; i++) { if ((i == 0) || (*InputPath != '_')) /* First char is allowed to be underscore */ { diff --git a/drivers/bus/acpi/acpica/namespace/nsobject.c b/drivers/bus/acpi/acpica/namespace/nsobject.c index bca4193076..c327893ba4 100644 --- a/drivers/bus/acpi/acpica/namespace/nsobject.c +++ b/drivers/bus/acpi/acpica/namespace/nsobject.c @@ -244,6 +244,11 @@ AcpiNsDetachObject ( } } + if (ObjDesc->Common.Type == ACPI_TYPE_REGION) + { + AcpiUtRemoveAddressRange(ObjDesc->Region.SpaceId, Node); + } + /* Clear the Node entry in all cases */ Node->Object = NULL; diff --git a/drivers/bus/acpi/acpica/namespace/nsparse.c b/drivers/bus/acpi/acpica/namespace/nsparse.c index c7e33972a6..72e0537569 100644 --- a/drivers/bus/acpi/acpica/namespace/nsparse.c +++ b/drivers/bus/acpi/acpica/namespace/nsparse.c @@ -257,7 +257,7 @@ AcpiNsOneCompleteParse ( /* Found OSDT table, enable the namespace override feature */ - if (ACPI_COMPARE_NAME(Table->Signature, ACPI_SIG_OSDT) && + if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_OSDT) && PassNumber == ACPI_IMODE_LOAD_PASS1) { WalkState->NamespaceOverride = TRUE; diff --git a/drivers/bus/acpi/acpica/namespace/nsrepair.c b/drivers/bus/acpi/acpica/namespace/nsrepair.c index b1fa63b2db..8c8a4e9ee2 100644 --- a/drivers/bus/acpi/acpica/namespace/nsrepair.c +++ b/drivers/bus/acpi/acpica/namespace/nsrepair.c @@ -362,7 +362,7 @@ AcpiNsMatchSimpleRepair ( ThisName = AcpiObjectRepairInfo; while (ThisName->ObjectConverter) { - if (ACPI_COMPARE_NAME (Node->Name.Ascii, ThisName->Name)) + if (ACPI_COMPARE_NAMESEG (Node->Name.Ascii, ThisName->Name)) { /* Check if we can actually repair this name/type combination */ diff --git a/drivers/bus/acpi/acpica/namespace/nsrepair2.c b/drivers/bus/acpi/acpica/namespace/nsrepair2.c index 7f2c400621..6668ad1130 100644 --- a/drivers/bus/acpi/acpica/namespace/nsrepair2.c +++ b/drivers/bus/acpi/acpica/namespace/nsrepair2.c @@ -61,7 +61,7 @@ ACPI_STATUS (*ACPI_REPAIR_FUNCTION) ( typedef struct acpi_repair_info { - char Name[ACPI_NAME_SIZE]; + char Name[ACPI_NAMESEG_SIZE]; ACPI_REPAIR_FUNCTION RepairFunction; } ACPI_REPAIR_INFO; @@ -250,7 +250,7 @@ AcpiNsMatchComplexRepair ( ThisName = AcpiNsRepairableNames; while (ThisName->RepairFunction) { - if (ACPI_COMPARE_NAME (Node->Name.Ascii, ThisName->Name)) + if (ACPI_COMPARE_NAMESEG (Node->Name.Ascii, ThisName->Name)) { return (ThisName); } diff --git a/drivers/bus/acpi/acpica/namespace/nsutils.c b/drivers/bus/acpi/acpica/namespace/nsutils.c index fe0fd35e05..2584dca6a2 100644 --- a/drivers/bus/acpi/acpica/namespace/nsutils.c +++ b/drivers/bus/acpi/acpica/namespace/nsutils.c @@ -243,7 +243,7 @@ AcpiNsGetInternalNameLength ( } } - Info->Length = (ACPI_NAME_SIZE * Info->NumSegments) + + Info->Length = (ACPI_NAMESEG_SIZE * Info->NumSegments) + 4 + Info->NumCarats; Info->NextExternalChar = NextExternalChar; @@ -335,7 +335,7 @@ AcpiNsBuildInternalName ( for (; NumSegments; NumSegments--) { - for (i = 0; i < ACPI_NAME_SIZE; i++) + for (i = 0; i < ACPI_NAMESEG_SIZE; i++) { if (ACPI_IS_PATH_SEPARATOR (*ExternalName) || (*ExternalName == 0)) @@ -364,7 +364,7 @@ AcpiNsBuildInternalName ( /* Move on the next segment */ ExternalName++; - Result += ACPI_NAME_SIZE; + Result += ACPI_NAMESEG_SIZE; } /* Terminate the string */ @@ -613,12 +613,12 @@ AcpiNsExternalizeName ( /* Copy and validate the 4-char name segment */ - ACPI_MOVE_NAME (&(*ConvertedName)[j], + ACPI_COPY_NAMESEG (&(*ConvertedName)[j], &InternalName[NamesIndex]); AcpiUtRepairName (&(*ConvertedName)[j]); - j += ACPI_NAME_SIZE; - NamesIndex += ACPI_NAME_SIZE; + j += ACPI_NAMESEG_SIZE; + NamesIndex += ACPI_NAMESEG_SIZE; } } diff --git a/drivers/bus/acpi/acpica/namespace/nsxfname.c b/drivers/bus/acpi/acpica/namespace/nsxfname.c index 6cdc9114a7..1d44670ef3 100644 --- a/drivers/bus/acpi/acpica/namespace/nsxfname.c +++ b/drivers/bus/acpi/acpica/namespace/nsxfname.c @@ -583,8 +583,8 @@ AcpiInstallMethod ( /* Table must be a DSDT or SSDT */ - if (!ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT) && - !ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_SSDT)) + if (!ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_DSDT) && + !ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_SSDT)) { return (AE_BAD_HEADER); } diff --git a/drivers/bus/acpi/acpica/parser/psargs.c b/drivers/bus/acpi/acpica/parser/psargs.c index 3189ea4d89..130bece424 100644 --- a/drivers/bus/acpi/acpica/parser/psargs.c +++ b/drivers/bus/acpi/acpica/parser/psargs.c @@ -206,21 +206,21 @@ AcpiPsGetNextNamestring ( /* Two name segments */ - End += 1 + (2 * ACPI_NAME_SIZE); + End += 1 + (2 * ACPI_NAMESEG_SIZE); break; case AML_MULTI_NAME_PREFIX: /* Multiple name segments, 4 chars each, count in next byte */ - End += 2 + (*(End + 1) * ACPI_NAME_SIZE); + End += 2 + (*(End + 1) * ACPI_NAMESEG_SIZE); break; default: /* Single name segment */ - End += ACPI_NAME_SIZE; + End += ACPI_NAMESEG_SIZE; break; } @@ -600,7 +600,7 @@ AcpiPsGetNextField ( ACPI_MOVE_32_TO_32 (&Name, ParserState->Aml); AcpiPsSetName (Field, Name); - ParserState->Aml += ACPI_NAME_SIZE; + ParserState->Aml += ACPI_NAMESEG_SIZE; ASL_CV_CAPTURE_COMMENTS_ONLY (ParserState); diff --git a/drivers/bus/acpi/acpica/resources/rsxface.c b/drivers/bus/acpi/acpica/resources/rsxface.c index cfbabec405..dae2656122 100644 --- a/drivers/bus/acpi/acpica/resources/rsxface.c +++ b/drivers/bus/acpi/acpica/resources/rsxface.c @@ -717,10 +717,10 @@ AcpiWalkResources ( /* Parameter validation */ if (!DeviceHandle || !UserFunction || !Name || - (!ACPI_COMPARE_NAME (Name, METHOD_NAME__CRS) && - !ACPI_COMPARE_NAME (Name, METHOD_NAME__PRS) && - !ACPI_COMPARE_NAME (Name, METHOD_NAME__AEI) && - !ACPI_COMPARE_NAME (Name, METHOD_NAME__DMA))) + (!ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__CRS) && + !ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__PRS) && + !ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__AEI) && + !ACPI_COMPARE_NAMESEG (Name, METHOD_NAME__DMA))) { return_ACPI_STATUS (AE_BAD_PARAMETER); } diff --git a/drivers/bus/acpi/acpica/tables/tbdata.c b/drivers/bus/acpi/acpica/tables/tbdata.c index 6c210b38cb..63d3137ec6 100644 --- a/drivers/bus/acpi/acpica/tables/tbdata.c +++ b/drivers/bus/acpi/acpica/tables/tbdata.c @@ -568,7 +568,7 @@ AcpiTbVerifyTempTable ( /* If a particular signature is expected (DSDT/FACS), it must match */ if (Signature && - !ACPI_COMPARE_NAME (&TableDesc->Signature, Signature)) + !ACPI_COMPARE_NAMESEG (&TableDesc->Signature, Signature)) { ACPI_BIOS_ERROR ((AE_INFO, "Invalid signature 0x%X for ACPI table, expected [%s]", diff --git a/drivers/bus/acpi/acpica/tables/tbfind.c b/drivers/bus/acpi/acpica/tables/tbfind.c index e3e7c5c1e8..465c5fc13a 100644 --- a/drivers/bus/acpi/acpica/tables/tbfind.c +++ b/drivers/bus/acpi/acpica/tables/tbfind.c @@ -99,7 +99,7 @@ AcpiTbFindTable ( /* Normalize the input strings */ memset (&Header, 0, sizeof (ACPI_TABLE_HEADER)); - ACPI_MOVE_NAME (Header.Signature, Signature); + ACPI_COPY_NAMESEG (Header.Signature, Signature); strncpy (Header.OemId, OemId, ACPI_OEM_ID_SIZE); strncpy (Header.OemTableId, OemTableId, ACPI_OEM_TABLE_ID_SIZE); @@ -109,7 +109,7 @@ AcpiTbFindTable ( for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i) { if (memcmp (&(AcpiGbl_RootTableList.Tables[i].Signature), - Header.Signature, ACPI_NAME_SIZE)) + Header.Signature, ACPI_NAMESEG_SIZE)) { /* Not the requested table */ @@ -137,7 +137,7 @@ AcpiTbFindTable ( /* Check for table match on all IDs */ if (!memcmp (AcpiGbl_RootTableList.Tables[i].Pointer->Signature, - Header.Signature, ACPI_NAME_SIZE) && + Header.Signature, ACPI_NAMESEG_SIZE) && (!OemId[0] || !memcmp (AcpiGbl_RootTableList.Tables[i].Pointer->OemId, Header.OemId, ACPI_OEM_ID_SIZE)) && diff --git a/drivers/bus/acpi/acpica/tables/tbinstal.c b/drivers/bus/acpi/acpica/tables/tbinstal.c index 969716b7fa..73bc45d069 100644 --- a/drivers/bus/acpi/acpica/tables/tbinstal.c +++ b/drivers/bus/acpi/acpica/tables/tbinstal.c @@ -166,7 +166,7 @@ AcpiTbInstallStandardTable ( */ if (!Reload && AcpiGbl_DisableSsdtTableInstall && - ACPI_COMPARE_NAME (&NewTableDesc.Signature, ACPI_SIG_SSDT)) + ACPI_COMPARE_NAMESEG (&NewTableDesc.Signature, ACPI_SIG_SSDT)) { ACPI_INFO (( "Ignoring installation of %4.4s at %8.8X%8.8X", diff --git a/drivers/bus/acpi/acpica/tables/tbprint.c b/drivers/bus/acpi/acpica/tables/tbprint.c index 11bd00908d..99af47ab06 100644 --- a/drivers/bus/acpi/acpica/tables/tbprint.c +++ b/drivers/bus/acpi/acpica/tables/tbprint.c @@ -117,10 +117,10 @@ AcpiTbCleanupTableHeader ( memcpy (OutHeader, Header, sizeof (ACPI_TABLE_HEADER)); - AcpiTbFixString (OutHeader->Signature, ACPI_NAME_SIZE); + AcpiTbFixString (OutHeader->Signature, ACPI_NAMESEG_SIZE); AcpiTbFixString (OutHeader->OemId, ACPI_OEM_ID_SIZE); AcpiTbFixString (OutHeader->OemTableId, ACPI_OEM_TABLE_ID_SIZE); - AcpiTbFixString (OutHeader->AslCompilerId, ACPI_NAME_SIZE); + AcpiTbFixString (OutHeader->AslCompilerId, ACPI_NAMESEG_SIZE); } @@ -145,7 +145,7 @@ AcpiTbPrintTableHeader ( ACPI_TABLE_HEADER LocalHeader; - if (ACPI_COMPARE_NAME (Header->Signature, ACPI_SIG_FACS)) + if (ACPI_COMPARE_NAMESEG (Header->Signature, ACPI_SIG_FACS)) { /* FACS only has signature and length fields */ @@ -212,8 +212,8 @@ AcpiTbVerifyChecksum ( * They are the odd tables, have no standard ACPI header and no checksum */ - if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_S3PT) || - ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS)) + if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_S3PT) || + ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_FACS)) { return (AE_OK); } diff --git a/drivers/bus/acpi/acpica/tables/tbutils.c b/drivers/bus/acpi/acpica/tables/tbutils.c index e71596b66c..58d3027b17 100644 --- a/drivers/bus/acpi/acpica/tables/tbutils.c +++ b/drivers/bus/acpi/acpica/tables/tbutils.c @@ -395,7 +395,7 @@ AcpiTbParseRootTable ( ACPI_TABLE_ORIGIN_INTERNAL_PHYSICAL, FALSE, TRUE, &TableIndex); if (ACPI_SUCCESS (Status) && - ACPI_COMPARE_NAME ( + ACPI_COMPARE_NAMESEG ( &AcpiGbl_RootTableList.Tables[TableIndex].Signature, ACPI_SIG_FADT)) { diff --git a/drivers/bus/acpi/acpica/tables/tbxface.c b/drivers/bus/acpi/acpica/tables/tbxface.c index 6974964033..7f709953ee 100644 --- a/drivers/bus/acpi/acpica/tables/tbxface.c +++ b/drivers/bus/acpi/acpica/tables/tbxface.c @@ -293,7 +293,7 @@ AcpiGetTableHeader ( for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++) { - if (!ACPI_COMPARE_NAME ( + if (!ACPI_COMPARE_NAMESEG ( &(AcpiGbl_RootTableList.Tables[i].Signature), Signature)) { continue; @@ -396,7 +396,7 @@ AcpiGetTable ( { TableDesc = &AcpiGbl_RootTableList.Tables[i]; - if (!ACPI_COMPARE_NAME (&TableDesc->Signature, Signature)) + if (!ACPI_COMPARE_NAMESEG (&TableDesc->Signature, Signature)) { continue; } diff --git a/drivers/bus/acpi/acpica/tables/tbxfload.c b/drivers/bus/acpi/acpica/tables/tbxfload.c index 32095dccf8..723924ae5d 100644 --- a/drivers/bus/acpi/acpica/tables/tbxfload.c +++ b/drivers/bus/acpi/acpica/tables/tbxfload.c @@ -167,7 +167,7 @@ AcpiTbLoadNamespace ( Table = &AcpiGbl_RootTableList.Tables[AcpiGbl_DsdtIndex]; if (!AcpiGbl_RootTableList.CurrentTableCount || - !ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_DSDT) || + !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_DSDT) || ACPI_FAILURE (AcpiTbValidateTable (Table))) { Status = AE_NO_ACPI_TABLES; @@ -226,9 +226,9 @@ AcpiTbLoadNamespace ( Table = &AcpiGbl_RootTableList.Tables[i]; if (!Table->Address || - (!ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_SSDT) && - !ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_PSDT) && - !ACPI_COMPARE_NAME (Table->Signature.Ascii, ACPI_SIG_OSDT)) || + (!ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_SSDT) && + !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_PSDT) && + !ACPI_COMPARE_NAMESEG (Table->Signature.Ascii, ACPI_SIG_OSDT)) || ACPI_FAILURE (AcpiTbValidateTable (Table))) { continue; @@ -448,7 +448,7 @@ AcpiUnloadParentTable ( * only these types can contain AML and thus are the only types * that can create namespace objects. */ - if (ACPI_COMPARE_NAME ( + if (ACPI_COMPARE_NAMESEG ( AcpiGbl_RootTableList.Tables[i].Signature.Ascii, ACPI_SIG_DSDT)) { diff --git a/drivers/bus/acpi/acpica/utilities/utascii.c b/drivers/bus/acpi/acpica/utilities/utascii.c index 06a3586c49..259c91a10b 100644 --- a/drivers/bus/acpi/acpica/utilities/utascii.c +++ b/drivers/bus/acpi/acpica/utilities/utascii.c @@ -68,7 +68,7 @@ AcpiUtValidNameseg ( /* Validate each character in the signature */ - for (i = 0; i < ACPI_NAME_SIZE; i++) + for (i = 0; i < ACPI_NAMESEG_SIZE; i++) { if (!AcpiUtValidNameChar (Name[i], i)) { diff --git a/drivers/bus/acpi/acpica/utilities/utdecode.c b/drivers/bus/acpi/acpica/utilities/utdecode.c index 9bd3d501fa..2002050836 100644 --- a/drivers/bus/acpi/acpica/utilities/utdecode.c +++ b/drivers/bus/acpi/acpica/utilities/utdecode.c @@ -106,17 +106,17 @@ const UINT8 AcpiGbl_NsProperties[ACPI_NUM_NS_TYPES] = const char *AcpiGbl_RegionTypes[ACPI_NUM_PREDEFINED_REGIONS] = { - "SystemMemory", /* 0x00 */ - "SystemIO", /* 0x01 */ - "PCI_Config", /* 0x02 */ - "EmbeddedControl", /* 0x03 */ - "SMBus", /* 0x04 */ - "SystemCMOS", /* 0x05 */ - "PCIBARTarget", /* 0x06 */ - "IPMI", /* 0x07 */ - "GeneralPurposeIo", /* 0x08 */ - "GenericSerialBus", /* 0x09 */ - "PCC" /* 0x0A */ + "SystemMemory", /* 0x00 */ + "SystemIO", /* 0x01 */ + "PCI_Config", /* 0x02 */ + "EmbeddedControl", /* 0x03 */ + "SMBus", /* 0x04 */ + "SystemCMOS", /* 0x05 */ + "PCIBARTarget", /* 0x06 */ + "IPMI", /* 0x07 */ + "GeneralPurposeIo", /* 0x08 */ + "GenericSerialBus", /* 0x09 */ + "PlatformCommChannel"/* 0x0A */ }; @@ -308,7 +308,7 @@ AcpiUtGetNodeName ( ACPI_NAMESPACE_NODE *Node = (ACPI_NAMESPACE_NODE *) Object; - /* Must return a string of exactly 4 characters == ACPI_NAME_SIZE */ + /* Must return a string of exactly 4 characters == ACPI_NAMESEG_SIZE */ if (!Object) { @@ -524,7 +524,7 @@ static const char *AcpiGbl_GenericNotify[ACPI_GENERIC_NOTIFY_MAX + 1] /* 0B */ "System Locality Update", /* 0C */ "Reserved (was previously Shutdown Request)", /* Reserved in ACPI 6.0 */ /* 0D */ "System Resource Affinity Update", - /* 0E */ "Heterogeneous Memory Attributes Update" /* ACPI 6.2 */ + /* 0E */ "Heterogeneous Memory Attributes Update", /* ACPI 6.2 */ /* 0F */ "Error Disconnect Recover" /* ACPI 6.3 */ }; diff --git a/drivers/bus/acpi/acpica/utilities/utmisc.c b/drivers/bus/acpi/acpica/utilities/utmisc.c index bbb384562d..6e43b68244 100644 --- a/drivers/bus/acpi/acpica/utilities/utmisc.c +++ b/drivers/bus/acpi/acpica/utilities/utmisc.c @@ -106,10 +106,10 @@ AcpiUtIsAmlTable ( /* These are the only tables that contain executable AML */ - if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_DSDT) || - ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_PSDT) || - ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_SSDT) || - ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_OSDT) || + if (ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_DSDT) || + ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_PSDT) || + ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_SSDT) || + ACPI_COMPARE_NAMESEG (Table->Signature, ACPI_SIG_OSDT) || ACPI_IS_OEM_SIG (Table->Signature)) { return (TRUE); diff --git a/drivers/bus/acpi/acpica/utilities/utpredef.c b/drivers/bus/acpi/acpica/utilities/utpredef.c index 3650dd7c67..17b68677ce 100644 --- a/drivers/bus/acpi/acpica/utilities/utpredef.c +++ b/drivers/bus/acpi/acpica/utilities/utpredef.c @@ -129,7 +129,7 @@ AcpiUtMatchPredefinedMethod ( ThisName = AcpiGbl_PredefinedMethods; while (ThisName->Info.Name[0]) { - if (ACPI_COMPARE_NAME (Name, ThisName->Info.Name)) + if (ACPI_COMPARE_NAMESEG (Name, ThisName->Info.Name)) { return (ThisName); } @@ -266,7 +266,7 @@ AcpiUtMatchResourceName ( ThisName = AcpiGbl_ResourceNames; while (ThisName->Info.Name[0]) { - if (ACPI_COMPARE_NAME (Name, ThisName->Info.Name)) + if (ACPI_COMPARE_NAMESEG (Name, ThisName->Info.Name)) { return (ThisName); } diff --git a/drivers/bus/acpi/acpica/utilities/utstring.c b/drivers/bus/acpi/acpica/utilities/utstring.c index b45e8f9a81..ba7b5adecd 100644 --- a/drivers/bus/acpi/acpica/utilities/utstring.c +++ b/drivers/bus/acpi/acpica/utilities/utstring.c @@ -195,16 +195,16 @@ AcpiUtRepairName ( * Special case for the root node. This can happen if we get an * error during the execution of module-level code. */ - if (ACPI_COMPARE_NAME (Name, ACPI_ROOT_PATHNAME)) + if (ACPI_COMPARE_NAMESEG (Name, ACPI_ROOT_PATHNAME)) { return; } - ACPI_MOVE_NAME (&OriginalName, Name); + ACPI_COPY_NAMESEG (&OriginalName, Name); /* Check each character in the name */ - for (i = 0; i < ACPI_NAME_SIZE; i++) + for (i = 0; i < ACPI_NAMESEG_SIZE; i++) { if (AcpiUtValidNameChar (Name[i], i)) { diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index a74c79e744..e82f0aff3f 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -95,5 +95,5 @@ Used Version: 1.6.36 Website: http://libpng.sourceforge.net/ Title: ACPICA -Used Version: 20190215 +Used Version: 20190329 Website: https://acpica.org/

1 0

[reactos] 01/01: [NTOS:IO] Send IRPs to the correct device in IoVolumeDeviceToDosName. CORE-15415
by Thomas Faber 30 Mar '19

30 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d605b5063fa4e659b371f… commit d605b5063fa4e659b371fbd4a37a85953dea6039 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Mar 29 09:08:36 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Sat Mar 30 10:13:27 2019 +0100 [NTOS:IO] Send IRPs to the correct device in IoVolumeDeviceToDosName. CORE-15415 --- modules/rostests/kmtests/CMakeLists.txt | 1 + modules/rostests/kmtests/kmtest_drv/testlist.c | 2 + modules/rostests/kmtests/ntos_io/IoVolume.c | 122 +++++++++++++++++++++++++ ntoskrnl/io/iomgr/volume.c | 4 +- 4 files changed, 127 insertions(+), 2 deletions(-) diff --git a/modules/rostests/kmtests/CMakeLists.txt b/modules/rostests/kmtests/CMakeLists.txt index 8d56d61b2d..c12751eaa0 100644 --- a/modules/rostests/kmtests/CMakeLists.txt +++ b/modules/rostests/kmtests/CMakeLists.txt @@ -67,6 +67,7 @@ list(APPEND KMTEST_DRV_SOURCE ntos_io/IoInterrupt.c ntos_io/IoIrp.c ntos_io/IoMdl.c + ntos_io/IoVolume.c ntos_ke/KeApc.c ntos_ke/KeDevQueue.c ntos_ke/KeDpc.c diff --git a/modules/rostests/kmtests/kmtest_drv/testlist.c b/modules/rostests/kmtests/kmtest_drv/testlist.c index 11d63bbad2..3dc3a6d0fc 100644 --- a/modules/rostests/kmtests/kmtest_drv/testlist.c +++ b/modules/rostests/kmtests/kmtest_drv/testlist.c @@ -33,6 +33,7 @@ KMT_TESTFUNC Test_IoFilesystem; KMT_TESTFUNC Test_IoInterrupt; KMT_TESTFUNC Test_IoIrp; KMT_TESTFUNC Test_IoMdl; +KMT_TESTFUNC Test_IoVolume; KMT_TESTFUNC Test_KeApc; KMT_TESTFUNC Test_KeDeviceQueue; KMT_TESTFUNC Test_KeDpc; @@ -106,6 +107,7 @@ const KMT_TEST TestList[] = { "IoInterrupt", Test_IoInterrupt }, { "IoIrp", Test_IoIrp }, { "IoMdl", Test_IoMdl }, + { "IoVolume", Test_IoVolume }, { "KeApc", Test_KeApc }, { "KeDeviceQueue", Test_KeDeviceQueue }, { "KeDpc", Test_KeDpc }, diff --git a/modules/rostests/kmtests/ntos_io/IoVolume.c b/modules/rostests/kmtests/ntos_io/IoVolume.c new file mode 100644 index 0000000000..ad862f49aa --- /dev/null +++ b/modules/rostests/kmtests/ntos_io/IoVolume.c @@ -0,0 +1,122 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Kernel-Mode Test Suite Volume Device test + * COPYRIGHT: Copyright 2019 Thomas Faber (thomas.faber(a)reactos.org) + */ + +#include <kmt_test.h> + +static +NTSTATUS +GetNextVolumeDevice( + _Inout_ PUNICODE_STRING VolumeDeviceName, + _Inout_ PULONG VolumeNumber, + _In_ NTSTATUS PreviousStatus) +{ + NTSTATUS Status; + +#ifndef __REACTOS__ + *VolumeNumber++; + Status = RtlStringCbPrintfW(VolumeDeviceName->Buffer, + VolumeDeviceName->MaximumLength, + L"\\Device\\HarddiskVolume%lu", + *VolumeNumber); +#else + /* ROS's storage stack is old an broken, we don't have HarddiskVolumeN */ + ULONG DiskNumber, PartitionNumber; + DiskNumber = *VolumeNumber >> 16; + PartitionNumber = *VolumeNumber & 0xffff; + if (!NT_SUCCESS(PreviousStatus)) + { + if (PartitionNumber == 1) + { + /* Looks like this disk doesn't exist (or has no partitions), + * so we're done */ + return STATUS_NO_MORE_ENTRIES; + } + DiskNumber++; + PartitionNumber = 0; + } + PartitionNumber++; + Status = RtlStringCbPrintfW(VolumeDeviceName->Buffer, + VolumeDeviceName->MaximumLength, + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskNumber, + PartitionNumber); + *VolumeNumber = DiskNumber << 16 | PartitionNumber; +#endif + return Status; +} + +static +void +TestIoVolumeDeviceToDosName(void) +{ + NTSTATUS Status; + ULONG VolumeNumber; + WCHAR VolumeDeviceNameBuffer[32]; + UNICODE_STRING VolumeDeviceName; + PFILE_OBJECT FileObject; + PDEVICE_OBJECT DeviceObject; + UNICODE_STRING DosName; + UNICODE_STRING DosVolumePrefix = RTL_CONSTANT_STRING(L"\\\\?\\Volume"); + + RtlInitEmptyUnicodeString(&VolumeDeviceName, + VolumeDeviceNameBuffer, + sizeof(VolumeDeviceNameBuffer)); + VolumeNumber = 0; + Status = STATUS_SUCCESS; + while (1) + { + Status = GetNextVolumeDevice(&VolumeDeviceName, + &VolumeNumber, + Status); + if (!NT_SUCCESS(Status)) + { + trace("GetNextVolumeDevice(0x%lx) failed with %lx\n", + VolumeNumber, Status); + break; + } + + RtlInitUnicodeString(&VolumeDeviceName, VolumeDeviceNameBuffer); + Status = IoGetDeviceObjectPointer(&VolumeDeviceName, + READ_CONTROL, + &FileObject, + &DeviceObject); + if (!NT_SUCCESS(Status)) + { + trace("IoGetDeviceObjectPointer(%wZ) failed with %lx\n", + &VolumeDeviceName, Status); + continue; + } + + Status = IoVolumeDeviceToDosName(DeviceObject, &DosName); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(NT_SUCCESS(Status), "No DOS name\n")) + { + trace("DOS name for %wZ is %wZ\n", &VolumeDeviceName, &DosName); + if (DosName.Length == 2 * sizeof(WCHAR)) + { + ok(DosName.Buffer[0] >= L'A' && + DosName.Buffer[0] <= L'Z' && + DosName.Buffer[1] == L':', + "Unexpected drive letter: %wZ\n", &DosName); + } + else + { + ok(RtlPrefixUnicodeString(&DosVolumePrefix, &DosName, FALSE), + "Unexpected volume path: %wZ\n", &DosName); + } + RtlFreeUnicodeString(&DosName); + } + ObDereferenceObject(FileObject); + Status = STATUS_SUCCESS; + } + ok(VolumeNumber > 1, "No volumes found\n"); +} + +START_TEST(IoVolume) +{ + TestIoVolumeDeviceToDosName(); +} diff --git a/ntoskrnl/io/iomgr/volume.c b/ntoskrnl/io/iomgr/volume.c index d5ab2ec17d..6c2e3191e9 100644 --- a/ntoskrnl/io/iomgr/volume.c +++ b/ntoskrnl/io/iomgr/volume.c @@ -1346,7 +1346,7 @@ IoVolumeDeviceToDosName(IN PVOID VolumeDeviceObject, goto DereferenceFO; } - Status = IoCallDriver(VolumeDeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); @@ -1396,7 +1396,7 @@ IoVolumeDeviceToDosName(IN PVOID VolumeDeviceObject, goto ReleaseMemory; } - Status = IoCallDriver(VolumeDeviceObject, Irp); + Status = IoCallDriver(DeviceObject, Irp); if (Status == STATUS_PENDING) { KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL);

1 0

[reactos] 01/01: [MEH] Forgot that file :-(
by Pierre Schweitzer 29 Mar '19

29 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a5063948ed8d2248f278… commit 3a5063948ed8d2248f2785d2abed7e82f1cc893c Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Mar 29 21:51:41 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Mar 29 21:51:41 2019 +0100 [MEH] Forgot that file :-( --- ntoskrnl/include/internal/io.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ntoskrnl/include/internal/io.h b/ntoskrnl/include/internal/io.h index 7e93ca8856..14a427973b 100644 --- a/ntoskrnl/include/internal/io.h +++ b/ntoskrnl/include/internal/io.h @@ -934,6 +934,12 @@ IopUnloadDevice( IN PDEVICE_OBJECT DeviceObject ); +PDEVICE_OBJECT +NTAPI +IopGetDeviceAttachmentBase( + IN PDEVICE_OBJECT DeviceObject +); + // // IRP Routines //

1 0

[reactos] 02/02: [NTOSKRNL] We don't need an event if we don't issue an IRP
by Pierre Schweitzer 29 Mar '19

29 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef8b1a1907a4601ba5723… commit ef8b1a1907a4601ba57231949a57147173fac9ff Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Mar 29 21:47:34 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Mar 29 21:47:34 2019 +0100 [NTOSKRNL] We don't need an event if we don't issue an IRP --- ntoskrnl/io/iomgr/iofunc.c | 67 ++++++++++++++++++++++++++++------------------ 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 5831b55896..627ff9644b 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -4164,18 +4164,6 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle, return Status; } } - else - { - /* Use local event */ - Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); - if (!Event) - { - ObDereferenceObject(FileObject); - return STATUS_INSUFFICIENT_RESOURCES; - } - KeInitializeEvent(Event, SynchronizationEvent, FALSE); - LocalEvent = TRUE; - } /* * Quick path for FileFsDeviceInformation - the kernel has enough @@ -4203,18 +4191,29 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Cleanup */ - IopCleanupAfterException(FileObject, NULL, NULL, Event); + /* Check if we had a file lock */ + if (BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + /* Release it */ + IopUnlockFileObject(FileObject); + } + + /* Dereference the FO */ + ObDereferenceObject(FileObject); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - /* - * We didn't have an exception, but we didn't issue an IRP - * to complete either, so avoid duplicating code and - * call appropriate helper - */ - IopCleanupAfterException(FileObject, NULL, NULL, Event); + /* Check if we had a file lock */ + if (BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + /* Release it */ + IopUnlockFileObject(FileObject); + } + + /* Dereference the FO */ + ObDereferenceObject(FileObject); return STATUS_SUCCESS; } @@ -4258,16 +4257,32 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle, ExFreePoolWithTag(DriverPathInfo, TAG_IO); } - /* - * We didn't have an exception, but we didn't issue an IRP - * to complete either, so avoid duplicating code and - * call appropriate helper - */ - IopCleanupAfterException(FileObject, NULL, NULL, Event); + /* Check if we had a file lock */ + if (BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + /* Release it */ + IopUnlockFileObject(FileObject); + } + + /* Dereference the FO */ + ObDereferenceObject(FileObject); return Status; } + if (!BooleanFlagOn(FileObject->Flags, FO_SYNCHRONOUS_IO)) + { + /* Use local event */ + Event = ExAllocatePoolWithTag(NonPagedPool, sizeof(KEVENT), TAG_IO); + if (!Event) + { + ObDereferenceObject(FileObject); + return STATUS_INSUFFICIENT_RESOURCES; + } + KeInitializeEvent(Event, SynchronizationEvent, FALSE); + LocalEvent = TRUE; + } + /* Get the device object */ DeviceObject = IoGetRelatedDeviceObject(FileObject);

1 0

[reactos] 01/02: [NTOSKRNL] Implement support for FileFsDriverPathInformation in NtQueryVolumeInformationFile
by Pierre Schweitzer 29 Mar '19

29 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=28ba29e4576541efa6ba9… commit 28ba29e4576541efa6ba9bd07fc4e0381b719bbe Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Mar 29 21:42:42 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Mar 29 21:42:42 2019 +0100 [NTOSKRNL] Implement support for FileFsDriverPathInformation in NtQueryVolumeInformationFile --- ntoskrnl/io/iomgr/iofunc.c | 131 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index e6ecefc7ff..5831b55896 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -1052,6 +1052,88 @@ IopGetMountFlag(IN PDEVICE_OBJECT DeviceObject) return Mounted; } +static +BOOLEAN +IopVerifyDriverObjectOnStack(IN PDEVICE_OBJECT DeviceObject, + IN PDRIVER_OBJECT DriverObject) +{ + PDEVICE_OBJECT StackDO; + + /* Browse our whole device stack, trying to find the appropriate driver */ + StackDO = IopGetDeviceAttachmentBase(DeviceObject); + while (StackDO != NULL) + { + /* We've found the driver, return success */ + if (StackDO->DriverObject == DriverObject) + { + return TRUE; + } + + /* Move to the next */ + StackDO = StackDO->AttachedDevice; + } + + /* We only reach there if driver was not found */ + return FALSE; +} + +static +NTSTATUS +IopGetDriverPathInformation(IN PFILE_OBJECT FileObject, + IN PFILE_FS_DRIVER_PATH_INFORMATION DriverPathInfo, + IN ULONG Length) +{ + KIRQL OldIrql; + NTSTATUS Status; + UNICODE_STRING DriverName; + PDRIVER_OBJECT DriverObject; + + /* Make sure the structure is consistent (ie, driver name fits into the buffer) */ + if (Length - FIELD_OFFSET(FILE_FS_DRIVER_PATH_INFORMATION, DriverName) < DriverPathInfo->DriverNameLength) + { + return STATUS_INVALID_PARAMETER; + } + + /* Setup the whole driver name */ + DriverName.Length = DriverPathInfo->DriverNameLength; + DriverName.MaximumLength = DriverPathInfo->DriverNameLength; + DriverName.Buffer = &DriverPathInfo->DriverName[0]; + + /* Ask Ob for such driver */ + Status = ObReferenceObjectByName(&DriverName, + OBJ_CASE_INSENSITIVE, + NULL, + 0, + IoDriverObjectType, + KernelMode, + NULL, + (PVOID*)&DriverObject); + /* No such driver, bail out */ + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Lock the devices database, we'll browse it */ + OldIrql = KeAcquireQueuedSpinLock(LockQueueIoDatabaseLock); + /* If we have a VPB, browse the stack from the volume */ + if (FileObject->Vpb != NULL && FileObject->Vpb->DeviceObject != NULL) + { + DriverPathInfo->DriverInPath = IopVerifyDriverObjectOnStack(FileObject->Vpb->DeviceObject, DriverObject); + } + /* Otherwise, do it from the normal device */ + else + { + DriverPathInfo->DriverInPath = IopVerifyDriverObjectOnStack(FileObject->DeviceObject, DriverObject); + } + KeReleaseQueuedSpinLock(LockQueueIoDatabaseLock, OldIrql); + + /* No longer needed */ + ObDereferenceObject(DriverObject); + + return STATUS_SUCCESS; +} + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -4136,6 +4218,55 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle, return STATUS_SUCCESS; } + /* This is to be handled by the kernel, not by FSD */ + else if (FsInformationClass == FileFsDriverPathInformation) + { + PFILE_FS_DRIVER_PATH_INFORMATION DriverPathInfo; + + _SEH2_TRY + { + /* Allocate our local structure */ + DriverPathInfo = ExAllocatePoolWithQuotaTag(NonPagedPool, Length, TAG_IO); + + /* And copy back caller data */ + RtlCopyMemory(DriverPathInfo, FsInformation, Length); + + /* Is the driver in the IO path? */ + Status = IopGetDriverPathInformation(FileObject, DriverPathInfo, Length); + /* We failed, don't continue execution */ + if (!NT_SUCCESS(Status)) + { + RtlRaiseStatus(Status); + } + + /* We succeed, copy back info */ + ((PFILE_FS_DRIVER_PATH_INFORMATION)FsInformation)->DriverInPath = DriverPathInfo->DriverInPath; + + /* We're done */ + IoStatusBlock->Information = sizeof(FILE_FS_DRIVER_PATH_INFORMATION); + IoStatusBlock->Status = STATUS_SUCCESS; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + /* Don't leak */ + if (DriverPathInfo != NULL) + { + ExFreePoolWithTag(DriverPathInfo, TAG_IO); + } + + /* + * We didn't have an exception, but we didn't issue an IRP + * to complete either, so avoid duplicating code and + * call appropriate helper + */ + IopCleanupAfterException(FileObject, NULL, NULL, Event); + + return Status; + } /* Get the device object */ DeviceObject = IoGetRelatedDeviceObject(FileObject);

1 0

[reactos] 01/01: [NTOSKRNL] Do. Not. L. E. A. K.
by Pierre Schweitzer 29 Mar '19

29 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=092c37f845cd76bd5821d… commit 092c37f845cd76bd5821d5fcd6e7fdd57ba96dd9 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Fri Mar 29 19:51:38 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Fri Mar 29 19:51:38 2019 +0100 [NTOSKRNL] Do. Not. L. E. A. K. --- ntoskrnl/io/iomgr/iofunc.c | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/ntoskrnl/io/iomgr/iofunc.c b/ntoskrnl/io/iomgr/iofunc.c index 5fd1a130ef..e6ecefc7ff 100644 --- a/ntoskrnl/io/iomgr/iofunc.c +++ b/ntoskrnl/io/iomgr/iofunc.c @@ -4121,29 +4121,18 @@ NtQueryVolumeInformationFile(IN HANDLE FileHandle, } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - /* Check if we had a file lock */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Release it */ - IopUnlockFileObject(FileObject); - } - - /* Dereference the FO */ - ObDereferenceObject(FileObject); - + /* Cleanup */ + IopCleanupAfterException(FileObject, NULL, NULL, Event); _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - /* Check if we had a file lock */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Release it */ - IopUnlockFileObject(FileObject); - } - - /* Dereference the FO */ - ObDereferenceObject(FileObject); + /* + * We didn't have an exception, but we didn't issue an IRP + * to complete either, so avoid duplicating code and + * call appropriate helper + */ + IopCleanupAfterException(FileObject, NULL, NULL, Event); return STATUS_SUCCESS; }

1 0

[reactos] 03/03: [NULL] Use correct device characteristics value for the null device
by Maxim Smirnov 28 Mar '19

28 Mar '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5570cde2717a9a21f004f… commit 5570cde2717a9a21f004fc647172e18ac55744cc Author: Maxim Smirnov <33279413+Simi4(a)users.noreply.github.com> AuthorDate: Wed Mar 27 04:23:21 2019 +0300 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Thu Mar 28 22:46:04 2019 +0100 [NULL] Use correct device characteristics value for the null device --- drivers/base/null/null.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/null/null.c b/drivers/base/null/null.c index 0d4ed541de2..54cb9bea114 100644 --- a/drivers/base/null/null.c +++ b/drivers/base/null/null.c @@ -186,7 +186,7 @@ DriverEntry(IN PDRIVER_OBJECT DriverObject, 0, &DeviceName, FILE_DEVICE_NULL, - 0, + FILE_DEVICE_SECURE_OPEN, FALSE, &DeviceObject); if (!NT_SUCCESS(Status))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs