untrusted comment: signature from openbsd 5.9 base secret key
RWQJVNompF3pwakKijRy3ju/a7GVEwsdeMTQ7I1GXdEeu01fbftb/yLDmXSDAf39pM2W20hyCFz9RIL71pB00UXji5YFrxqulQM=

OpenBSD 5.9 errata 12, June 27, 2016:

Fix several issues in the OCSP code that could result in the incorrect
generation and parsing of OCSP requests. This remediates a lack of error
checking on time parsing in these functions, and ensures that only
GENERALIZEDTIME formats are accepted for OCSP, as per RFC 6960

Issues reported, and fixes provided by Kazuki Yamaguchi <[email protected]>
and Kinichiro Inoguchi <[email protected]>

Apply by doing:
   signify -Vep /etc/signify/openbsd-59-base.pub -x 012_crypto.patch.sig \
           -m - | (cd /usr/src && patch -p0)

And then rebuild and install libcrypto:
       cd /usr/src/lib/libcrypto
       make obj
       make depend
       make
       make install

Index: lib/libssl/src/crypto/ocsp/ocsp_cl.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/crypto/ocsp/ocsp_cl.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -u -p -r1.8 -r1.9
--- lib/libssl/src/crypto/ocsp/ocsp_cl.c        18 Oct 2014 17:20:40 -0000      1.8
+++ lib/libssl/src/crypto/ocsp/ocsp_cl.c        25 Jun 2016 15:38:44 -0000      1.9
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp_cl.c,v 1.8 2014/10/18 17:20:40 jsing Exp $ */
+/* $OpenBSD: ocsp_cl.c,v 1.9 2016/06/25 15:38:44 beck Exp $ */
/* Written by Tom Titchener <[email protected]> for the OpenSSL
 * project. */

@@ -71,6 +71,9 @@
#include <openssl/x509.h>
#include <openssl/x509v3.h>

+int asn1_time_parse(const char *, size_t, struct tm *, int);
+int asn1_tm_cmp(struct tm *, struct tm *);
+
/* Utility functions related to sending OCSP requests and extracting
 * relevant information from the response.
 */
@@ -329,25 +332,43 @@ OCSP_check_validity(ASN1_GENERALIZEDTIME
{
       int ret = 1;
       time_t t_now, t_tmp;
+       struct tm tm_this, tm_next, tm_tmp;

       time(&t_now);
+
+       /*
+        * Times must explicitly be a GENERALIZEDTIME as per section
+        * 4.2.2.1 of RFC 6960 - It is invalid to accept other times
+        * (such as UTCTIME permitted/required by RFC 5280 for certificates)
+        */
+
       /* Check thisUpdate is valid and not more than nsec in the future */
-       if (!ASN1_GENERALIZEDTIME_check(thisupd)) {
+       if (asn1_time_parse(thisupd->data, thisupd->length, &tm_this,
+           V_ASN1_GENERALIZEDTIME) != V_ASN1_GENERALIZEDTIME) {
               OCSPerr(OCSP_F_OCSP_CHECK_VALIDITY,
                   OCSP_R_ERROR_IN_THISUPDATE_FIELD);
               ret = 0;
       } else {
               t_tmp = t_now + nsec;
-               if (X509_cmp_time(thisupd, &t_tmp) > 0) {
+               if (gmtime_r(&t_tmp, &tm_tmp) == NULL)
+                       return 0;
+               if (asn1_tm_cmp(&tm_this, &tm_tmp) > 0) {
                       OCSPerr(OCSP_F_OCSP_CHECK_VALIDITY,
                           OCSP_R_STATUS_NOT_YET_VALID);
                       ret = 0;
               }

-               /* If maxsec specified check thisUpdate is not more than maxsec in the past */
+               /*
+                * If maxsec specified check thisUpdate is not more than maxsec
+                * in the past
+                */
               if (maxsec >= 0) {
                       t_tmp = t_now - maxsec;
-                       if (X509_cmp_time(thisupd, &t_tmp) < 0) {
+                       if (gmtime_r(&t_tmp, &tm_tmp) == NULL)
+                               return 0;
+                       if (gmtime_r(&t_tmp, &tm_tmp) == NULL)
+                               return 0;
+                       if (asn1_tm_cmp(&tm_this, &tm_tmp) < 0) {
                               OCSPerr(OCSP_F_OCSP_CHECK_VALIDITY,
                                   OCSP_R_STATUS_TOO_OLD);
                               ret = 0;
@@ -359,13 +380,16 @@ OCSP_check_validity(ASN1_GENERALIZEDTIME
               return ret;

       /* Check nextUpdate is valid and not more than nsec in the past */
-       if (!ASN1_GENERALIZEDTIME_check(nextupd)) {
+       if (asn1_time_parse(nextupd->data, nextupd->length, &tm_next,
+           V_ASN1_GENERALIZEDTIME) != V_ASN1_GENERALIZEDTIME) {
               OCSPerr(OCSP_F_OCSP_CHECK_VALIDITY,
                   OCSP_R_ERROR_IN_NEXTUPDATE_FIELD);
               ret = 0;
       } else {
               t_tmp = t_now - nsec;
-               if (X509_cmp_time(nextupd, &t_tmp) < 0) {
+               if (gmtime_r(&t_tmp, &tm_tmp) == NULL)
+                       return 0;
+               if (asn1_tm_cmp(&tm_next, &tm_tmp) < 0) {
                       OCSPerr(OCSP_F_OCSP_CHECK_VALIDITY,
                           OCSP_R_STATUS_EXPIRED);
                       ret = 0;
Index: lib/libssl/src/crypto/ocsp/ocsp_srv.c
===================================================================
RCS file: /cvs/src/lib/libssl/src/crypto/ocsp/ocsp_srv.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -u -p -r1.7 -r1.8
--- lib/libssl/src/crypto/ocsp/ocsp_srv.c       18 Oct 2014 17:20:40 -0000      1.7
+++ lib/libssl/src/crypto/ocsp/ocsp_srv.c       25 Jun 2016 16:10:26 -0000      1.8
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp_srv.c,v 1.7 2014/10/18 17:20:40 jsing Exp $ */
+/* $OpenBSD: ocsp_srv.c,v 1.8 2016/06/25 16:10:26 beck Exp $ */
/* Written by Dr Stephen N Henson ([email protected]) for the OpenSSL
 * project 2001.
 */
@@ -260,7 +260,7 @@ OCSP_basic_sign(OCSP_BASICRESP *brsp, X5
       }

       if (!(flags & OCSP_NOTIME) &&
-           !X509_gmtime_adj(brsp->tbsResponseData->producedAt, 0))
+           !ASN1_GENERALIZEDTIME_set(brsp->tbsResponseData->producedAt, time(NULL)))
               goto err;

       /* Right now, I think that not doing double hashing is the right

You are viewing proxied material from ftp.icm.edu.pl. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.