#include "keychain_find.h"
#include "keychain_utilities.h"
-#include "readline.h"
-#include "security.h"
+#include "readline_cssm.h"
+#include "security_tool.h"
#include <stdio.h>
#include <stdlib.h>
#include <Security/SecCertificate.h>
#include <CoreFoundation/CFString.h>
#include <ctype.h>
+#include <utilities/SecCFRelease.h>
// SecDigestGetData, SecKeychainSearchCreateForCertificateByEmail, SecCertificateFindByEmail
}
if (kind != NULL && !primaryKey) {
attrs[attrList.count].tag = kSecDescriptionItemAttr;
- attrs[attrList.count].length = strlen(kind);
+ attrs[attrList.count].length = (UInt32) strlen(kind);
attrs[attrList.count].data = (void*)kind;
attrList.count++;
}
if (value != NULL && !primaryKey) {
attrs[attrList.count].tag = kSecGenericItemAttr;
- attrs[attrList.count].length = strlen(value);
+ attrs[attrList.count].length = (UInt32) strlen(value);
attrs[attrList.count].data = (void*)value;
attrList.count++;
}
if (comment != NULL && !primaryKey) {
attrs[attrList.count].tag = kSecCommentItemAttr;
- attrs[attrList.count].length = strlen(comment);
+ attrs[attrList.count].length = (UInt32) strlen(comment);
attrs[attrList.count].data = (void*)comment;
attrList.count++;
}
if (label != NULL && !primaryKey) {
attrs[attrList.count].tag = kSecLabelItemAttr;
- attrs[attrList.count].length = strlen(label);
+ attrs[attrList.count].length = (UInt32) strlen(label);
attrs[attrList.count].data = (void*)label;
attrList.count++;
}
if (serviceName != NULL) {
attrs[attrList.count].tag = kSecServiceItemAttr;
- attrs[attrList.count].length = strlen(serviceName);
+ attrs[attrList.count].length = (UInt32) strlen(serviceName);
attrs[attrList.count].data = (void*)serviceName;
attrList.count++;
}
if (accountName != NULL) {
attrs[attrList.count].tag = kSecAccountItemAttr;
- attrs[attrList.count].length = strlen(accountName);
+ attrs[attrList.count].length = (UInt32) strlen(accountName);
attrs[attrList.count].data = (void*)accountName;
attrList.count++;
}
}
if (kind != NULL && !primaryKey) {
attrs[attrList.count].tag = kSecDescriptionItemAttr;
- attrs[attrList.count].length = strlen(kind);
+ attrs[attrList.count].length = (UInt32) strlen(kind);
attrs[attrList.count].data = (void*)kind;
attrList.count++;
}
if (comment != NULL && !primaryKey) {
attrs[attrList.count].tag = kSecCommentItemAttr;
- attrs[attrList.count].length = strlen(comment);
+ attrs[attrList.count].length = (UInt32) strlen(comment);
attrs[attrList.count].data = (void*)comment;
attrList.count++;
}
if (label != NULL && !primaryKey) {
attrs[attrList.count].tag = kSecLabelItemAttr;
- attrs[attrList.count].length = strlen(label);
+ attrs[attrList.count].length = (UInt32) strlen(label);
attrs[attrList.count].data = (void*)label;
attrList.count++;
}
if (serverName != NULL) {
attrs[attrList.count].tag = kSecServerItemAttr;
- attrs[attrList.count].length = strlen(serverName);
+ attrs[attrList.count].length = (UInt32) strlen(serverName);
attrs[attrList.count].data = (void*)serverName;
attrList.count++;
}
if (securityDomain != NULL) {
attrs[attrList.count].tag = kSecSecurityDomainItemAttr;
- attrs[attrList.count].length = strlen(securityDomain);
+ attrs[attrList.count].length = (UInt32) strlen(securityDomain);
attrs[attrList.count].data = (void *)securityDomain;
attrList.count++;
}
if (accountName != NULL) {
attrs[attrList.count].tag = kSecAccountItemAttr;
- attrs[attrList.count].length = strlen(accountName);
+ attrs[attrList.count].length = (UInt32) strlen(accountName);
attrs[attrList.count].data = (void *)accountName;
attrList.count++;
}
if (path != NULL) {
attrs[attrList.count].tag = kSecPathItemAttr;
- attrs[attrList.count].length = strlen(path);
+ attrs[attrList.count].length = (UInt32) strlen(path);
attrs[attrList.count].data = (void *)path;
attrList.count++;
}
} else {
char *password = (char *) passwordData;
int doHex = 0;
- for(
int i=0; i<passwordLength; i++) if(!isprint(password[i])) doHex = 1;
+ for(
uint32_t i=0; i<passwordLength; i++) if(!isprint(password[i])) doHex = 1;
if(doHex) {
- for(
int i=0; i<passwordLength; i++) printf("%02x", password[i]);
+ for(
uint32_t i=0; i<passwordLength; i++) printf("%02x", password[i]);
} else {
- for(
int i=0; i<passwordLength; i++) putchar(password[i]);
+ for(
uint32_t i=0; i<passwordLength; i++) putchar(password[i]);
}
putchar('\n');
}
if ((SecCertificateGetData(certificateRef, &data) == noErr) &&
(SecDigestGetData(CSSM_ALGID_SHA1, &digest, &data) == CSSM_OK)) {
unsigned int i;
- uint32 len = digest.Length;
+ size_t len = digest.Length;
uint8 *cp = digest.Data;
fprintf(stdout, "SHA-1 hash: ");
for(i=0; i<len; i++) {
return result;
}
+#define SetKeyToString(dict, key, arg) \
+{ \
+ CFStringRef str = CFStringCreateWithCStringNoCopy(NULL, arg, kCFStringEncodingUTF8, kCFAllocatorNull); \
+ CFDictionarySetValue(dict, key, str); \
+ CFReleaseNull(str); \
+}
+
+int
+keychain_find_key(int argc, char * const *argv) {
+ /*
+ * " -a Match \"application label\" string\n"
+ * " -c Match \"creator\" (four-character code)\n"
+ * " -d Match keys that can decrypt\n"
+ * " -D Match \"description\" string\n"
+ * " -e Match keys that can encrypt\n"
+ * " -j Match \"comment\" string\n"
+ * " -l Match \"label\" string\n"
+ * " -r Match keys that can derive\n"
+ * " -s Match keys that can sign\n"
+ * " -t Type of key to find: one of \"symmetric\", \"public\", or \"private\"\n"
+ * " -u Match keys that can unwrap\n"
+ * " -v Match keys that can verify\n"
+ * " -w Match keys that can wrap\n"
+ */
+
+ CFMutableDictionaryRef query = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+ CFDictionarySetValue(query, kSecClass, kSecClassKey);
+ CFDictionarySetValue(query, kSecMatchLimit, kSecMatchLimitAll);
+
+ CFTypeRef results = NULL;
+
+ int ch, result = 0;
+ while ((ch = getopt(argc, argv, "a:c:dD:ej:l:rst:uvw")) != -1)
+ {
+ switch (ch)
+ {
+ case 'a':
+ SetKeyToString(query, kSecAttrApplicationLabel, optarg);
+ break;
+ case 'c':
+ SetKeyToString(query, kSecAttrCreator, optarg);
+ break;
+ case 'd':
+ CFDictionarySetValue(query, kSecAttrCanDecrypt, kCFBooleanTrue);
+ break;
+ case 'D':
+ SetKeyToString(query, kSecAttrDescription, optarg);
+ break;
+ case 'e':
+ CFDictionarySetValue(query, kSecAttrCanEncrypt, kCFBooleanTrue);
+ break;
+ case 'j':
+ SetKeyToString(query, kSecAttrComment, optarg);
+ break;
+ case 'l':
+ SetKeyToString(query, kSecAttrLabel, optarg);
+ break;
+ case 'r':
+ CFDictionarySetValue(query, kSecAttrCanDerive, kCFBooleanTrue);
+ break;
+ case 's':
+ CFDictionarySetValue(query, kSecAttrCanSign, kCFBooleanTrue);
+ break;
+ case 't':
+ if(strcmp(optarg, "symmetric") == 0) {
+ CFDictionarySetValue(query, kSecAttrKeyClass, kSecAttrKeyClassSymmetric);
+ } else if(strcmp(optarg, "public") == 0) {
+ CFDictionarySetValue(query, kSecAttrKeyClass, kSecAttrKeyClassPublic);
+ } else if(strcmp(optarg, "private") == 0) {
+ CFDictionarySetValue(query, kSecAttrKeyClass, kSecAttrKeyClassPrivate);
+ } else {
+ result = 2;
+ goto cleanup;
+ }
+ break;
+ case 'u':
+ CFDictionarySetValue(query, kSecAttrCanUnwrap, kCFBooleanTrue);
+ break;
+ case 'v':
+ CFDictionarySetValue(query, kSecAttrCanVerify, kCFBooleanTrue);
+ break;
+ case 'w':
+ CFDictionarySetValue(query, kSecAttrCanWrap, kCFBooleanTrue);
+ break;
+ case '?':
+ default:
+ result = 2;
+ goto cleanup;
+ }
+ }
+
+ argc -= optind;
+ argv += optind;
+
+ CFTypeRef keychainOrArray = keychain_create_array(argc, argv);
+
+ if(keychainOrArray && CFGetTypeID(keychainOrArray) == CFArrayGetTypeID()) {
+ CFDictionarySetValue(query, kSecMatchSearchList, keychainOrArray);
+ } else if(keychainOrArray) {
+ // if it's not an array (but is something), it's a keychain. Put it in an array.
+ CFMutableArrayRef searchList = (CFMutableArrayRef) CFArrayCreateMutable(kCFAllocatorDefault, 1, &kCFTypeArrayCallBacks);
+ CFArrayAppendValue((CFMutableArrayRef)searchList, keychainOrArray);
+ CFDictionarySetValue(query, kSecMatchSearchList, searchList);
+ CFRelease(searchList);
+ }
+ CFReleaseNull(keychainOrArray);
+
+ OSStatus status = SecItemCopyMatching(query, &results);
+ if(status) {
+ sec_perror("SecItemCopyMatching", status);
+ result = 1;
+ goto cleanup;
+ }
+
+ if (CFGetTypeID(results) == CFArrayGetTypeID()) {
+ for(int i = 0; i < CFArrayGetCount(results); i++) {
+ SecKeychainItemRef item = (SecKeychainItemRef) CFArrayGetValueAtIndex(results, i);
+
+ print_keychain_item_attributes(stdout, item, FALSE, FALSE, FALSE, FALSE);
+ }
+ }
+
+cleanup:
+ safe_CFRelease(&results);
+ safe_CFRelease(&query);
+ return result;
+}
+
// Declare here to use later.
int keychain_set_partition_list(SecKeychainRef kc, CFDictionaryRef query, CFStringRef password, CFStringRef partitionlist);
-int keychain_parse_args_and_set_partition_list(int argc, char * const *argv, CFDictionaryRef query, CFStringRef partitionidsinput, CFStringRef password);
+int keychain_parse_args_and_set_partition_list(int argc, char * const *argv, CFMutableDictionaryRef query, CFStringRef partitionidsinput, CFStringRef password);
int keychain_set_internet_password_partition_list(int argc, char * const *argv) {
/*
switch (ch)
{
case 'a':
- CFDictionarySetValue(query, kSecAttrAccount, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrAccount, optarg);
break;
case 'c':
- CFDictionarySetValue(query, kSecAttrCreator, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrCreator, optarg);
break;
case 'C':
- CFDictionarySetValue(query, kSecAttrType, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrType, optarg);
break;
case 'd':
- CFDictionarySetValue(query, kSecAttrSecurityDomain, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrSecurityDomain, optarg);
break;
case 'D':
- CFDictionarySetValue(query, kSecAttrDescription, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrDescription, optarg);
break;
case 'j':
- CFDictionarySetValue(query, kSecAttrComment, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrComment, optarg);
break;
case 'l':
- CFDictionarySetValue(query, kSecAttrLabel, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrLabel, optarg);
break;
case 'p':
- CFDictionarySetValue(query, kSecAttrPath, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrPath, optarg);
break;
case 'P':
- CFDictionarySetValue(query, kSecAttrPort, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrPort, optarg);
break;
case 'r':
- CFDictionarySetValue(query, kSecAttrProtocol, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrProtocol, optarg);
break;
case 's':
- CFDictionarySetValue(query, kSecAttrService, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrService, optarg);
break;
case 't':
- CFDictionarySetValue(query, kSecAttrAuthenticationType, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrAuthenticationType, optarg);
break;
case 'S':
+ CFReleaseNull(partitionidsinput);
partitionidsinput = CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull);
break;
case 'k':
+ CFReleaseNull(password);
password = CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull);
break;
case '?':
CFStringRef password = NULL;
int ch, result = 0;
- while ((ch = getopt(argc, argv, "a:c:C:D:G:j:l:s:S:k:")) != -1)
+ while ((ch = getopt(argc, argv, ":a:c:C:D:G:j:l:s:S:k:")) != -1)
{
switch (ch)
{
case 'a':
- CFDictionarySetValue(query, kSecAttrAccount, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrAccount, optarg);
break;
case 'c':
- CFDictionarySetValue(query, kSecAttrCreator, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrCreator, optarg);
break;
case 'C':
- CFDictionarySetValue(query, kSecAttrType, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrType, optarg);
break;
case 'D':
- CFDictionarySetValue(query, kSecAttrDescription, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrDescription, optarg);
break;
case 'G':
- CFDictionarySetValue(query, kSecAttrGeneric, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrGeneric, optarg);
break;
case 'j':
- CFDictionarySetValue(query, kSecAttrComment, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrComment, optarg);
break;
case 'l':
- CFDictionarySetValue(query, kSecAttrLabel, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrLabel, optarg);
break;
case 's':
- CFDictionarySetValue(query, kSecAttrService, CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull));
+ SetKeyToString(query, kSecAttrService, optarg);
break;
case 'S':
+ CFReleaseNull(partitionidsinput);
partitionidsinput = CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull);
break;
case 'k':
+ CFReleaseNull(password);
password = CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull);
break;
case '?':
+ case ':':
+ // They supplied the -k but with no data
+ // Leaving it null will cause prompt below
+ if (optopt == 'k') {
+ break;
+ }
+ result = 2;
+ goto cleanup; /* @@@ Return 2 triggers usage message. */
default:
result = 2;
goto cleanup;
return result;
}
+int
+keychain_set_key_partition_list(int argc, char * const *argv) {
+ /*
+ * " -a Match \"application label\" string\n"
+ * " -c Match \"creator\" (four-character code)\n"
+ * " -d Match keys that can decrypt\n"
+ * " -D Match \"description\" string\n"
+ * " -e Match keys that can encrypt\n"
+ * " -j Match \"comment\" string\n"
+ * " -l Match \"label\" string\n"
+ * " -r Match keys that can derive\n"
+ * " -s Match keys that can sign\n"
+ * " -t Type of key to find: one of \"symmetric\", \"public\", or \"private\"\n"
+ * " -u Match keys that can unwrap\n"
+ * " -v Match keys that can verify\n"
+ * " -w Match keys that can wrap\n"
+ * " -S Comma-separated list of allowed partition IDs
+ * " -k password for keychain (required)
+ */
+
+ CFMutableDictionaryRef query = CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+ CFDictionarySetValue(query, kSecClass, kSecClassKey);
+ CFDictionarySetValue(query, kSecMatchLimit, kSecMatchLimitAll);
+
+ CFStringRef partitionidsinput = NULL;
+ CFStringRef password = NULL;
+
+ int ch, result = 0;
+ while ((ch = getopt(argc, argv, ":a:c:dD:ej:k:l:rsS:t:uvw")) != -1)
+ {
+ switch (ch)
+ {
+ case 'a':
+ SetKeyToString(query, kSecAttrApplicationLabel, optarg);
+ break;
+ case 'c':
+ SetKeyToString(query, kSecAttrCreator, optarg);
+ break;
+ case 'd':
+ SetKeyToString(query, kSecAttrCanDecrypt, optarg);
+ CFDictionarySetValue(query, kSecAttrCanDecrypt, kCFBooleanTrue);
+ break;
+ case 'D':
+ SetKeyToString(query, kSecAttrDescription, optarg);
+ break;
+ case 'e':
+ CFDictionarySetValue(query, kSecAttrCanEncrypt, kCFBooleanTrue);
+ break;
+ case 'j':
+ SetKeyToString(query, kSecAttrComment, optarg);
+ break;
+ case 'l':
+ SetKeyToString(query, kSecAttrLabel, optarg);
+ break;
+ case 'r':
+ CFDictionarySetValue(query, kSecAttrCanDerive, kCFBooleanTrue);
+ case 's':
+ CFDictionarySetValue(query, kSecAttrCanSign, kCFBooleanTrue);
+ break;
+ case 't':
+ if(strcmp(optarg, "symmetric") == 0) {
+ CFDictionarySetValue(query, kSecAttrKeyClass, kSecAttrKeyClassSymmetric);
+ } else if(strcmp(optarg, "public") == 0) {
+ CFDictionarySetValue(query, kSecAttrKeyClass, kSecAttrKeyClassPublic);
+ } else if(strcmp(optarg, "private") == 0) {
+ CFDictionarySetValue(query, kSecAttrKeyClass, kSecAttrKeyClassPrivate);
+ } else {
+ result = 2;
+ goto cleanup;
+ }
+ break;
+ case 'u':
+ CFDictionarySetValue(query, kSecAttrCanUnwrap, kCFBooleanTrue);
+ break;
+ case 'v':
+ CFDictionarySetValue(query, kSecAttrCanVerify, kCFBooleanTrue);
+ break;
+ case 'w':
+ CFDictionarySetValue(query, kSecAttrCanWrap, kCFBooleanTrue);
+ break;
+ case 'S':
+ CFReleaseNull(partitionidsinput);
+ partitionidsinput = CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull);
+ break;
+ case 'k':
+ CFReleaseNull(password);
+ password = CFStringCreateWithCStringNoCopy(NULL, optarg, kCFStringEncodingUTF8, kCFAllocatorNull);
+ break;
+ case '?':
+ case ':':
+ // They supplied the -k but with no data
+ // Leaving it null will cause prompt below
+ if (optopt == 'k') {
+ break;
+ }
+ result = 2;
+ goto cleanup; /* @@@ Return 2 triggers usage message. */
+ default:
+ result = 2;
+ goto cleanup;
+ }
+ }
+
+ argc -= optind;
+ argv += optind;
+
+ result = keychain_parse_args_and_set_partition_list(argc, argv, query, partitionidsinput, password);
+
+cleanup:
+ CFReleaseNull(partitionidsinput);
+ CFReleaseNull(password);
+ safe_CFRelease(&query);
+ return result;
+}
+
-int keychain_parse_args_and_set_partition_list(int argc, char * const *argv, CFDictionaryRef query, CFStringRef partitionidsinput, CFStringRef password) {
+int keychain_parse_args_and_set_partition_list(int argc, char * const *argv, CFMutableDictionaryRef query, CFStringRef partitionidsinput, CFStringRef password) {
int result = 0;
const char *keychainName = NULL;
SecKeychainRef kc = NULL;
+ CFStringRef localPassword = NULL;
// if we were given a keychain, use it
if (argc == 1)
goto cleanup;
}
+ if(!partitionidsinput) {
+ result = 2;
+ goto cleanup;
+ }
+
if(!password) {
char* cpassword = prompt_password(keychainName);
if (!cpassword) {
result = -1;
goto cleanup;
}
- password = CFStringCreateWithCString(NULL, cpassword, kCFStringEncodingUTF8);
+ localPassword = CFStringCreateWithCString(NULL, cpassword, kCFStringEncodingUTF8);
+ password = localPassword;
free(cpassword);
}
- if(!partitionidsinput || !password) {
- result = 2;
- goto cleanup;
- }
-
result = keychain_set_partition_list(kc, query, password, partitionidsinput);
cleanup:
+ CFReleaseNull(localPassword);
return result;
}
GetCStringFromCFString(password, &passwordBuf, &passwordLen);
OSStatus status;
+ CFTypeRef results = NULL;
// Unlock the keychain with the given password, since we'll be fetching ACLs
status = SecKeychainUnlock(kc, (UInt32) passwordLen, passwordBuf, true);
goto cleanup;
}
- CFTypeRef results = NULL;
status = SecItemCopyMatching(query, &results);
if(status) {
sec_perror("SecItemCopyMatching", status);
projects / apple / security.git / blobdiff