Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: ppapi/c/private/pp_content_decryptor.h

Issue 2514123004: Fix range checking for PP_CdmKeyStatus (Closed)
Patch Set: more _MAX values Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ppapi/api/private/pp_content_decryptor.idl ('k') | ppapi/proxy/ppapi_messages.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. 3 * found in the LICENSE file.
4 */ 4 */
5 5
6 /* From private/pp_content_decryptor.idl modified Tue Oct 20 12:50:15 2015. */ 6 /* From private/pp_content_decryptor.idl modified Mon Nov 21 11:44:43 2016. */
7 7
8 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ 8 #ifndef PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
9 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ 9 #define PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_
10 10
11 #include "ppapi/c/pp_macros.h" 11 #include "ppapi/c/pp_macros.h"
12 #include "ppapi/c/pp_stdint.h" 12 #include "ppapi/c/pp_stdint.h"
13 13
14 /** 14 /**
15 * @file 15 * @file
16 * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information 16 * The <code>PP_DecryptTrackingInfo</code> struct contains necessary information
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 444
445 /** 445 /**
446 * @addtogroup Enums 446 * @addtogroup Enums
447 * @{ 447 * @{
448 */ 448 */
449 /** 449 /**
450 * <code>PP_DecryptorStreamType</code> contains stream type constants. 450 * <code>PP_DecryptorStreamType</code> contains stream type constants.
451 */ 451 */
452 typedef enum { 452 typedef enum {
453 PP_DECRYPTORSTREAMTYPE_AUDIO = 0, 453 PP_DECRYPTORSTREAMTYPE_AUDIO = 0,
454 PP_DECRYPTORSTREAMTYPE_VIDEO = 1 454 PP_DECRYPTORSTREAMTYPE_VIDEO = 1,
455 PP_DECRYPTORSTREAMTYPE_MAX = PP_DECRYPTORSTREAMTYPE_VIDEO
455 } PP_DecryptorStreamType; 456 } PP_DecryptorStreamType;
456 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_DecryptorStreamType, 4); 457 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_DecryptorStreamType, 4);
457 458
458 /** 459 /**
459 * <code>PP_SessionType</code> contains session type constants. 460 * <code>PP_SessionType</code> contains session type constants.
460 */ 461 */
461 typedef enum { 462 typedef enum {
462 PP_SESSIONTYPE_TEMPORARY = 0, 463 PP_SESSIONTYPE_TEMPORARY = 0,
463 PP_SESSIONTYPE_PERSISTENT_LICENSE = 1, 464 PP_SESSIONTYPE_PERSISTENT_LICENSE = 1,
464 PP_SESSIONTYPE_PERSISTENT_RELEASE = 2 465 PP_SESSIONTYPE_PERSISTENT_RELEASE = 2,
466 PP_SESSIONTYPE_MAX = PP_SESSIONTYPE_PERSISTENT_RELEASE
465 } PP_SessionType; 467 } PP_SessionType;
466 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_SessionType, 4); 468 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_SessionType, 4);
467 469
468 /** 470 /**
469 * <code>PP_InitDataType</code> contains Initialization Data Type constants. 471 * <code>PP_InitDataType</code> contains Initialization Data Type constants.
470 */ 472 */
471 typedef enum { 473 typedef enum {
472 PP_INITDATATYPE_CENC = 0, 474 PP_INITDATATYPE_CENC = 0,
473 PP_INITDATATYPE_KEYIDS = 1, 475 PP_INITDATATYPE_KEYIDS = 1,
474 PP_INITDATATYPE_WEBM = 2 476 PP_INITDATATYPE_WEBM = 2,
477 PP_INITDATATYPE_MAX = PP_INITDATATYPE_WEBM
475 } PP_InitDataType; 478 } PP_InitDataType;
476 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InitDataType, 4); 479 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InitDataType, 4);
477 480
478 /** 481 /**
479 * <code>PP_CdmExceptionCode</code> contains exception code constants. 482 * <code>PP_CdmExceptionCode</code> contains exception code constants.
480 */ 483 */
481 typedef enum { 484 typedef enum {
482 PP_CDMEXCEPTIONCODE_NOTSUPPORTEDERROR = 1, 485 PP_CDMEXCEPTIONCODE_NOTSUPPORTEDERROR = 1,
483 PP_CDMEXCEPTIONCODE_INVALIDSTATEERROR = 2, 486 PP_CDMEXCEPTIONCODE_INVALIDSTATEERROR = 2,
484 PP_CDMEXCEPTIONCODE_INVALIDACCESSERROR = 3, 487 PP_CDMEXCEPTIONCODE_INVALIDACCESSERROR = 3,
485 PP_CDMEXCEPTIONCODE_QUOTAEXCEEDEDERROR = 4, 488 PP_CDMEXCEPTIONCODE_QUOTAEXCEEDEDERROR = 4,
486 PP_CDMEXCEPTIONCODE_UNKNOWNERROR = 5, 489 PP_CDMEXCEPTIONCODE_UNKNOWNERROR = 5,
487 PP_CDMEXCEPTIONCODE_CLIENTERROR = 6, 490 PP_CDMEXCEPTIONCODE_CLIENTERROR = 6,
488 PP_CDMEXCEPTIONCODE_OUTPUTERROR = 7 491 PP_CDMEXCEPTIONCODE_OUTPUTERROR = 7,
492 PP_CDMEXCEPTIONCODE_MAX = PP_CDMEXCEPTIONCODE_OUTPUTERROR
489 } PP_CdmExceptionCode; 493 } PP_CdmExceptionCode;
490 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmExceptionCode, 4); 494 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmExceptionCode, 4);
491 495
492 /** 496 /**
493 * <code>PP_CdmMessageType</code> contains message type constants. 497 * <code>PP_CdmMessageType</code> contains message type constants.
494 */ 498 */
495 typedef enum { 499 typedef enum {
496 PP_CDMMESSAGETYPE_LICENSE_REQUEST = 0, 500 PP_CDMMESSAGETYPE_LICENSE_REQUEST = 0,
497 PP_CDMMESSAGETYPE_LICENSE_RENEWAL = 1, 501 PP_CDMMESSAGETYPE_LICENSE_RENEWAL = 1,
498 PP_CDMMESSAGETYPE_LICENSE_RELEASE = 2 502 PP_CDMMESSAGETYPE_LICENSE_RELEASE = 2,
503 PP_CDMMESSAGETYPE_MAX = PP_CDMMESSAGETYPE_LICENSE_RELEASE
499 } PP_CdmMessageType; 504 } PP_CdmMessageType;
500 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmMessageType, 4); 505 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmMessageType, 4);
501 506
502 /** 507 /**
503 * <code>PP_CdmKeyStatus</code> contains key status constants. 508 * <code>PP_CdmKeyStatus</code> contains key status constants.
504 */ 509 */
505 typedef enum { 510 typedef enum {
506 PP_CDMKEYSTATUS_USABLE = 0, 511 PP_CDMKEYSTATUS_USABLE = 0,
507 PP_CDMKEYSTATUS_INVALID = 1, 512 PP_CDMKEYSTATUS_INVALID = 1,
508 PP_CDMKEYSTATUS_EXPIRED = 2, 513 PP_CDMKEYSTATUS_EXPIRED = 2,
509 PP_CDMKEYSTATUS_OUTPUTRESTRICTED = 3, 514 PP_CDMKEYSTATUS_OUTPUTRESTRICTED = 3,
510 PP_CDMKEYSTATUS_OUTPUTDOWNSCALED = 4, 515 PP_CDMKEYSTATUS_OUTPUTDOWNSCALED = 4,
511 PP_CDMKEYSTATUS_STATUSPENDING = 5, 516 PP_CDMKEYSTATUS_STATUSPENDING = 5,
512 PP_CDMKEYSTATUS_RELEASED = 6 517 PP_CDMKEYSTATUS_RELEASED = 6,
518 PP_CDMKEYSTATUS_MAX = PP_CDMKEYSTATUS_RELEASED
513 } PP_CdmKeyStatus; 519 } PP_CdmKeyStatus;
514 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmKeyStatus, 4); 520 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmKeyStatus, 4);
515 /** 521 /**
516 * @} 522 * @}
517 */ 523 */
518 524
519 /** 525 /**
520 * @addtogroup Structs 526 * @addtogroup Structs
521 * @{ 527 * @{
522 */ 528 */
(...skipping 16 matching lines...) Expand all
539 */ 545 */
540 uint32_t system_code; 546 uint32_t system_code;
541 }; 547 };
542 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524); 548 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524);
543 /** 549 /**
544 * @} 550 * @}
545 */ 551 */
546 552
547 #endif /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */ 553 #endif /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */
548 554
OLDNEW
« no previous file with comments | « ppapi/api/private/pp_content_decryptor.idl ('k') | ppapi/proxy/ppapi_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698