common

Timestamp:

Nov 2, 2022 7:40:16 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154372

Message:

libs: Switch to openssl-3.0.7, bugref:10317

Location:

trunk/src/libs/openssl-3.0.7

Files:

trunk/src/libs/openssl-3.0.7

Property svn:mergeinfo

-              r94320
+              r97372
 /*
  * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2020-2022 The OpenSSL Project Authors. All Rights Reserved.
+ *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
 …
     saltlen = ossl_rsa_pss_params_30_saltlen(pss);
     trailerfield = ossl_rsa_pss_params_30_trailerfield(pss);
+    if (saltlen < 0) {
+        ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_SALT_LENGTH);
+        return 0;
+    }
+    if (trailerfield != 1) {
+        ERR_raise(ERR_LIB_RSA, RSA_R_INVALID_TRAILER);
+        return 0;
+    }
     /* Getting default values */
 …
     return ossl_DER_w_begin_sequence(pkt, tag)
         && (trailerfield == default_trailerfield
             || ossl_DER_w_ulong(pkt, 3, trailerfield))
         && (saltlen == default_saltlen || ossl_DER_w_ulong(pkt, 2, saltlen))
+            || ossl_DER_w_uint32(pkt, 3, (uint32_t)trailerfield))
+        && (saltlen == default_saltlen || ossl_DER_w_uint32(pkt, 2, (uint32_t)saltlen))
         && DER_w_MaskGenAlgorithm(pkt, 1, pss)
         && (hashalg_nid == default_hashalg_nid

Note: See TracChangeset for help on using the changeset viewer.