update to cvs head srtp

This commit is contained in:
Anthony Minessale committed 2013-03-31 21:27:19 -05:00
1 parent aad4da5b71
commit 72e2d183c1
100 files changed
+4732 -1509

No files matched your search

+22 -14
View File
@@ -28,14 +28,16 @@ usage(char *prog_name) {
exit(255);
}
#define AES_KEY_LEN 16
#define AES_MAX_KEY_LEN 32
int
main (int argc, char *argv[]) {
v128_t data, key;
v128_t data;
uint8_t key[AES_MAX_KEY_LEN];
aes_expanded_key_t exp_key;
int len;
int key_len, len;
int verbose;
err_status_t status;
if (argc == 3) {
/* we're not in verbose mode */
@@ -54,22 +56,23 @@ main (int argc, char *argv[]) {
}
/* read in key, checking length */
if (strlen(argv[1]) > AES_KEY_LEN*2) {
if (strlen(argv[1]) > AES_MAX_KEY_LEN*2) {
fprintf(stderr,
"error: too many digits in key "
"(should be %d hexadecimal digits, found %u)\n",
AES_KEY_LEN*2, (unsigned)strlen(argv[1]));
"(should be at most %d hexadecimal digits, found %u)\n",
AES_MAX_KEY_LEN*2, (unsigned)strlen(argv[1]));
exit(1);
}
len = hex_string_to_octet_string((char *)&key, argv[1], AES_KEY_LEN*2);
len = hex_string_to_octet_string((char*)key, argv[1], AES_MAX_KEY_LEN*2);
/* check that hex string is the right length */
if (len < AES_KEY_LEN*2) {
if (len != 32 && len != 48 && len != 64) {
fprintf(stderr,
"error: too few digits in key "
"(should be %d hexadecimal digits, found %d)\n",
AES_KEY_LEN*2, len);
"error: bad number of digits in key "
"(should be 32/48/64 hexadecimal digits, found %d)\n",
len);
exit(1);
}
key_len = len/2;
/* read in plaintext, checking length */
if (strlen(argv[2]) > 16*2) {
@@ -95,13 +98,18 @@ main (int argc, char *argv[]) {
}
/* encrypt plaintext */
aes_expand_encryption_key(&key, exp_key);
status = aes_expand_encryption_key(key, key_len, &exp_key);
if (status) {
fprintf(stderr,
"error: AES key expansion failed.\n");
exit(1);
}
aes_encrypt(&data, exp_key);
aes_encrypt(&data, &exp_key);
/* write ciphertext to output */
if (verbose) {
printf("key:\t\t%s\n", v128_hex_string(&key));
printf("key:\t\t%s\n", octet_string_hex_string(key, key_len));
printf("ciphertext:\t");
}
printf("%s\n", v128_hex_string(&data));