aacs-version.h   aacs-version.h 
skipping to change at line 29 skipping to change at line 29
#ifndef AACS_VERSION_H_ #ifndef AACS_VERSION_H_
#define AACS_VERSION_H_ #define AACS_VERSION_H_
#define AACS_VERSION_CODE(major, minor, micro) \ #define AACS_VERSION_CODE(major, minor, micro) \
(((major) * 10000) + \ (((major) * 10000) + \
((minor) * 100) + \ ((minor) * 100) + \
((micro) * 1)) ((micro) * 1))
#define AACS_VERSION_MAJOR 0 #define AACS_VERSION_MAJOR 0
#define AACS_VERSION_MINOR 3 #define AACS_VERSION_MINOR 4
#define AACS_VERSION_MICRO 1 #define AACS_VERSION_MICRO 0
#define AACS_VERSION_STRING "0.3.1" #define AACS_VERSION_STRING "0.4.0"
#define AACS_VERSION \ #define AACS_VERSION \
AACS_VERSION_CODE(AACS_VERSION_MAJOR, AACS_VERSION_MINOR, AACS_VERSION_ MICRO) AACS_VERSION_CODE(AACS_VERSION_MAJOR, AACS_VERSION_MINOR, AACS_VERSION_ MICRO)
#endif /* AACS_VERSION_H_ */ #endif /* AACS_VERSION_H_ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 aacs.h   aacs.h 
skipping to change at line 29 skipping to change at line 29
#ifndef AACS_H_ #ifndef AACS_H_
#define AACS_H_ #define AACS_H_
#include <stdint.h> #include <stdint.h>
#ifndef AACS_PUBLIC #ifndef AACS_PUBLIC
# define AACS_PUBLIC # define AACS_PUBLIC
#endif #endif
/* aacs_open2() error codes */
#define AACS_SUCCESS 0 /* no errors */
#define AACS_ERROR_CORRUPTED_DISC -1 /* opening or reading of AACS files fa
iled */
#define AACS_ERROR_NO_CONFIG -2 /* missing config file */
#define AACS_ERROR_NO_PK -3 /* no matching processing key */
#define AACS_ERROR_NO_CERT -4 /* no valid certificate */
#define AACS_ERROR_CERT_REVOKED -5 /* certificate has been revoked */
#define AACS_ERROR_MMC_OPEN -6 /* MMC open failed (no MMC drive ?) */
#define AACS_ERROR_MMC_FAILURE -7 /* MMC failed */
typedef struct aacs AACS; typedef struct aacs AACS;
AACS_PUBLIC void aacs_get_version(int *major, int *minor, int *micro); AACS_PUBLIC void aacs_get_version(int *major, int *minor, int *micro);
AACS_PUBLIC AACS *aacs_open(const char *path, const char *keyfile_path); AACS_PUBLIC AACS *aacs_open(const char *path, const char *keyfile_path);
AACS_PUBLIC AACS *aacs_open2(const char *path, const char *keyfile_path, in t *error_code);
AACS_PUBLIC void aacs_close(AACS *aacs); AACS_PUBLIC void aacs_close(AACS *aacs);
AACS_PUBLIC void aacs_select_title(AACS *aacs, uint32_t title); /* 0 - top menu, 0xffff - first play */ AACS_PUBLIC void aacs_select_title(AACS *aacs, uint32_t title); /* 0 - top menu, 0xffff - first play */
AACS_PUBLIC int aacs_decrypt_unit(AACS *aacs, uint8_t *buf); AACS_PUBLIC int aacs_decrypt_unit(AACS *aacs, uint8_t *buf);
/* Disc information */
AACS_PUBLIC int aacs_get_mkb_version(AACS *aacs);
AACS_PUBLIC const uint8_t *aacs_get_disc_id(AACS *aacs); AACS_PUBLIC const uint8_t *aacs_get_disc_id(AACS *aacs);
AACS_PUBLIC const uint8_t *aacs_get_vid(AACS *aacs); AACS_PUBLIC const uint8_t *aacs_get_vid(AACS *aacs); /* may fail even if di
sc can be decrypted */
/* revocation lists */
typedef struct {
uint16_t range;
uint8_t id[6];
} AACS_RL_ENTRY;
AACS_PUBLIC AACS_RL_ENTRY *aacs_get_hrl(int *num_entries, int *mkb_version)
;
AACS_PUBLIC AACS_RL_ENTRY *aacs_get_drl(int *num_entries, int *mkb_version)
;
#endif /* AACS_H_ */ #endif /* AACS_H_ */
 End of changes. 4 change blocks. 
1 lines changed or deleted 28 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/