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

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

Issue 2514123004: Fix range checking for PP_CdmKeyStatus (Closed)
Patch Set: add _MAX values Created 4 years 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
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 10:03:46 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 /** 478 /**
479 * <code>PP_CdmExceptionCode</code> contains exception code constants. 479 * <code>PP_CdmExceptionCode</code> contains exception code constants.
480 */ 480 */
481 typedef enum { 481 typedef enum {
482 PP_CDMEXCEPTIONCODE_NOTSUPPORTEDERROR = 1, 482 PP_CDMEXCEPTIONCODE_NOTSUPPORTEDERROR = 1,
483 PP_CDMEXCEPTIONCODE_INVALIDSTATEERROR = 2, 483 PP_CDMEXCEPTIONCODE_INVALIDSTATEERROR = 2,
484 PP_CDMEXCEPTIONCODE_INVALIDACCESSERROR = 3, 484 PP_CDMEXCEPTIONCODE_INVALIDACCESSERROR = 3,
485 PP_CDMEXCEPTIONCODE_QUOTAEXCEEDEDERROR = 4, 485 PP_CDMEXCEPTIONCODE_QUOTAEXCEEDEDERROR = 4,
486 PP_CDMEXCEPTIONCODE_UNKNOWNERROR = 5, 486 PP_CDMEXCEPTIONCODE_UNKNOWNERROR = 5,
487 PP_CDMEXCEPTIONCODE_CLIENTERROR = 6, 487 PP_CDMEXCEPTIONCODE_CLIENTERROR = 6,
488 PP_CDMEXCEPTIONCODE_OUTPUTERROR = 7 488 PP_CDMEXCEPTIONCODE_OUTPUTERROR = 7,
489 PP_CDMEXCEPTIONCODE_MAX = PP_CDMEXCEPTIONCODE_OUTPUTERROR
489 } PP_CdmExceptionCode; 490 } PP_CdmExceptionCode;
490 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmExceptionCode, 4); 491 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmExceptionCode, 4);
491 492
492 /** 493 /**
493 * <code>PP_CdmMessageType</code> contains message type constants. 494 * <code>PP_CdmMessageType</code> contains message type constants.
494 */ 495 */
495 typedef enum { 496 typedef enum {
496 PP_CDMMESSAGETYPE_LICENSE_REQUEST = 0, 497 PP_CDMMESSAGETYPE_LICENSE_REQUEST = 0,
497 PP_CDMMESSAGETYPE_LICENSE_RENEWAL = 1, 498 PP_CDMMESSAGETYPE_LICENSE_RENEWAL = 1,
498 PP_CDMMESSAGETYPE_LICENSE_RELEASE = 2 499 PP_CDMMESSAGETYPE_LICENSE_RELEASE = 2,
500 PP_CDMMESSAGETYPE_MAX = PP_CDMMESSAGETYPE_LICENSE_RELEASE
499 } PP_CdmMessageType; 501 } PP_CdmMessageType;
500 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmMessageType, 4); 502 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmMessageType, 4);
501 503
502 /** 504 /**
503 * <code>PP_CdmKeyStatus</code> contains key status constants. 505 * <code>PP_CdmKeyStatus</code> contains key status constants.
504 */ 506 */
505 typedef enum { 507 typedef enum {
506 PP_CDMKEYSTATUS_USABLE = 0, 508 PP_CDMKEYSTATUS_USABLE = 0,
507 PP_CDMKEYSTATUS_INVALID = 1, 509 PP_CDMKEYSTATUS_INVALID = 1,
508 PP_CDMKEYSTATUS_EXPIRED = 2, 510 PP_CDMKEYSTATUS_EXPIRED = 2,
509 PP_CDMKEYSTATUS_OUTPUTRESTRICTED = 3, 511 PP_CDMKEYSTATUS_OUTPUTRESTRICTED = 3,
510 PP_CDMKEYSTATUS_OUTPUTDOWNSCALED = 4, 512 PP_CDMKEYSTATUS_OUTPUTDOWNSCALED = 4,
511 PP_CDMKEYSTATUS_STATUSPENDING = 5, 513 PP_CDMKEYSTATUS_STATUSPENDING = 5,
512 PP_CDMKEYSTATUS_RELEASED = 6 514 PP_CDMKEYSTATUS_RELEASED = 6,
515 PP_CDMKEYSTATUS_MAX = PP_CDMKEYSTATUS_RELEASED
513 } PP_CdmKeyStatus; 516 } PP_CdmKeyStatus;
514 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmKeyStatus, 4); 517 PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_CdmKeyStatus, 4);
515 /** 518 /**
516 * @} 519 * @}
517 */ 520 */
518 521
519 /** 522 /**
520 * @addtogroup Structs 523 * @addtogroup Structs
521 * @{ 524 * @{
522 */ 525 */
(...skipping 16 matching lines...) Expand all
539 */ 542 */
540 uint32_t system_code; 543 uint32_t system_code;
541 }; 544 };
542 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524); 545 PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_KeyInformation, 524);
543 /** 546 /**
544 * @} 547 * @}
545 */ 548 */
546 549
547 #endif /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */ 550 #endif /* PPAPI_C_PRIVATE_PP_CONTENT_DECRYPTOR_H_ */
548 551
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698