| cms_ess.c (194206) | cms_ess.c (205128) |
|---|---|
| 1/* crypto/cms/cms_ess.c */ 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 3 * project. 4 */ 5/* ==================================================================== 6 * Copyright (c) 2008 The OpenSSL Project. All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 330 unchanged lines hidden (view full) --- 339 if (OBJ_cmp(octype, rct->contentType)) 340 { 341 CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_CONTENT_TYPE_MISMATCH); 342 goto err; 343 } 344 345 /* Get original receipt request details */ 346 | 1/* crypto/cms/cms_ess.c */ 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 3 * project. 4 */ 5/* ==================================================================== 6 * Copyright (c) 2008 The OpenSSL Project. All rights reserved. 7 * 8 * Redistribution and use in source and binary forms, with or without --- 330 unchanged lines hidden (view full) --- 339 if (OBJ_cmp(octype, rct->contentType)) 340 { 341 CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_CONTENT_TYPE_MISMATCH); 342 goto err; 343 } 344 345 /* Get original receipt request details */ 346 |
| 347 if (!CMS_get1_ReceiptRequest(osi, &rr)) | 347 if (CMS_get1_ReceiptRequest(osi, &rr) <= 0) |
| 348 { 349 CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_RECEIPT_REQUEST); 350 goto err; 351 } 352 353 if (ASN1_STRING_cmp(rr->signedContentIdentifier, 354 rct->signedContentIdentifier)) 355 { --- 24 unchanged lines hidden (view full) --- 380 CMS_ReceiptRequest *rr = NULL; 381 ASN1_OBJECT *ctype; 382 ASN1_OCTET_STRING *os = NULL; 383 384 /* Get original receipt request */ 385 386 /* Get original receipt request details */ 387 | 348 { 349 CMSerr(CMS_F_CMS_RECEIPT_VERIFY, CMS_R_NO_RECEIPT_REQUEST); 350 goto err; 351 } 352 353 if (ASN1_STRING_cmp(rr->signedContentIdentifier, 354 rct->signedContentIdentifier)) 355 { --- 24 unchanged lines hidden (view full) --- 380 CMS_ReceiptRequest *rr = NULL; 381 ASN1_OBJECT *ctype; 382 ASN1_OCTET_STRING *os = NULL; 383 384 /* Get original receipt request */ 385 386 /* Get original receipt request details */ 387 |
| 388 if (!CMS_get1_ReceiptRequest(si, &rr)) | 388 if (CMS_get1_ReceiptRequest(si, &rr) <= 0) |
| 389 { 390 CMSerr(CMS_F_CMS_ENCODE_RECEIPT, CMS_R_NO_RECEIPT_REQUEST); 391 goto err; 392 } 393 394 /* Get original content type */ 395 396 ctype = CMS_signed_get0_data_by_OBJ(si, --- 24 unchanged lines hidden --- | 389 { 390 CMSerr(CMS_F_CMS_ENCODE_RECEIPT, CMS_R_NO_RECEIPT_REQUEST); 391 goto err; 392 } 393 394 /* Get original content type */ 395 396 ctype = CMS_signed_get0_data_by_OBJ(si, --- 24 unchanged lines hidden --- |