#include <Security/SecEncryptTransform.h>
#include <Security/SecItem.h>
#include <Security/SecKey.h>
+#include <Security/SecRandom.h>
#include <CommonCrypto/CommonKeyDerivation.h>
#include <CommonCrypto/CommonCryptor.h>
#include <CoreFoundation/CFBase.h>
// Read /dev/random for random bytes
static CFDataRef
-getRandomBytes(size_t len)
+createRandomBytes(size_t len)
{
- uint8_t *buffer;
- CFDataRef randData = NULL;
- int fdrand;
-
- if((buffer = malloc(len)) == NULL) return NULL;
- if((fdrand = open("/dev/random", O_RDONLY)) == -1) return NULL;
- if(read(fdrand, buffer, len) == len) randData = CFDataCreate(kCFAllocatorDefault, (const UInt8 *) buffer, len);
- close(fdrand);
-
- free(buffer);
- return randData;
+ CFMutableDataRef data = CFDataCreateMutable(NULL, len);
+ if (data == NULL)
+ return NULL;
+ CFDataSetLength(data, len);
+ if (SecRandomCopyBytes(kSecRandomDefault, len, CFDataGetMutableBytePtr(data)) != noErr) {
+ CFRelease(data);
+ return NULL;
+ }
+ return data;
}
// This is the normalization routine - subject to change. We need to make sure that whitespace is removed and
#define MAXANSWERBUFF 4096
#define PBKDF_ROUNDS 100000
-static SecKeyRef secDeriveKeyFromAnswers(CFArrayRef answers, CFLocaleRef theLocale)
+static SecKeyRef CF_RETURNS_RETAINED
+secDeriveKeyFromAnswers(CFArrayRef answers, CFLocaleRef theLocale)
{
static const uint8_t salt[16] = { 0x0A, 0x1F, 0x0A, 0x1F, 0x0A, 0x1F, 0x0A, 0x1F, 0x0A, 0x1F, 0x0A, 0x1F, 0x0A, 0x1F, 0x0A, 0x1F };
static const int saltLen = sizeof(salt);
// Single shot CFString processing routines for digests/encoding/encrypt/decrypt
static CFDataRef
-digestString(CFStringRef str)
+createDigestString(CFStringRef str)
{
CFDataRef retval = NULL;
CFErrorRef error = NULL;
if(error == NULL) {
retval = SecTransformExecute(digestTrans, &error);
if(retval == NULL) {
- secDebug(ASL_LEVEL_ERR, "Couldn't create digest %s\n", CFStringGetCStringPtr(CFErrorCopyFailureReason(error), kCFStringEncodingUTF8));
+ CFStringRef errorReason = CFErrorCopyFailureReason(error);
+ secDebug(ASL_LEVEL_ERR, "Couldn't create digest %s\n", CFStringGetCStringPtr(errorReason, kCFStringEncodingUTF8));
+ CFReleaseNull(errorReason);
}
}
- CFRelease(digestTrans);
}
- CFRelease(inputString);
+ CFReleaseNull(digestTrans);
+ CFReleaseNull(inputString);
return retval;
}
return retval;
}
-static CFDataRef
+static CFDataRef CF_RETURNS_RETAINED
encryptString(SecKeyRef wrapKey, CFDataRef iv, CFStringRef str)
{
CFDataRef retval = NULL;
{
CFDataRef hashedPassword, retval;
CFMutableDataRef iv;
- if((hashedPassword = digestString(password)) == NULL) return NULL;
+ if((hashedPassword = createDigestString(password)) == NULL) return NULL;
iv = CFDataCreateMutableCopy(kCFAllocatorDefault, CFDataGetLength(hashedPassword)+1, hashedPassword);
CFDataDeleteBytes(iv, CFRangeMake(IVBYTECOUNT, CFDataGetLength(iv)-IVBYTECOUNT));
retval = CFDataCreateCopy(kCFAllocatorDefault, iv);
* recovery dictionary.
*/
-CFDictionaryRef
+CFDictionaryRef CF_RETURNS_RETAINED
SecWrapRecoveryPasswordWithAnswers(CFStringRef password, CFArrayRef questions, CFArrayRef answers)
{
uint32_t vers = 1;
- CFDataRef iv;
- CFDataRef wrappedPassword;
+ CFDataRef iv = NULL;
+ CFDataRef wrappedPassword = NULL;
CFMutableDictionaryRef retval = NULL;
CFLocaleRef theLocale = CFLocaleCopyCurrent();
CFStringRef theLocaleString = CFLocaleGetIdentifier(theLocale);
+ SecKeyRef wrapKey = NULL;
CFIndex ix, limit;
- if (!password || !questions || !answers)
- return NULL;
+ if (!password || !questions || !answers) {
+ goto error;
+ }
limit = CFArrayGetCount(answers);
- if (limit != CFArrayGetCount(questions))
- return NULL; // Error
+ if (limit != CFArrayGetCount(questions)) {
+ goto error;
+ }
CFTypeRef chkval;
for (ix=0; ix<limit; ix++)
{
chkval = CFArrayGetValueAtIndex(answers, ix);
- if (!chkval || CFGetTypeID(chkval)!=CFStringGetTypeID() || CFEqual((CFStringRef)chkval, CFSTR("")))
- return NULL;
+ if (!chkval || CFGetTypeID(chkval)!=CFStringGetTypeID() || CFEqual((CFStringRef)chkval, CFSTR(""))) {
+ goto error;
+ }
chkval = CFArrayGetValueAtIndex(questions, ix);
- if (!chkval || CFGetTypeID(chkval)!=CFStringGetTypeID() || CFEqual((CFStringRef)chkval, CFSTR("")))
- return NULL;
+ if (!chkval || CFGetTypeID(chkval)!=CFStringGetTypeID() || CFEqual((CFStringRef)chkval, CFSTR(""))) {
+ goto error;
+ }
}
iv = createIVFromPassword(password);
- SecKeyRef wrapKey = secDeriveKeyFromAnswers(answers, theLocale);
+ wrapKey = secDeriveKeyFromAnswers(answers, theLocale);
if((wrappedPassword = encryptString(wrapKey, iv, password)) != NULL) {
retval = CFDictionaryCreateMutable(kCFAllocatorDefault, 5, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
- CFDictionaryAddValue(retval, kSecRecVersionNumber, CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vers));
+ CFNumberRef num = CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &vers);
+ CFDictionaryAddValue(retval, kSecRecVersionNumber, num);
+ CFReleaseNull(num);
CFDictionaryAddValue(retval, kSecRecQuestions, questions);
CFDictionaryAddValue(retval, kSecRecLocale, theLocaleString);
- CFDictionaryAddValue(retval, kSecRecIV, b64encode(iv));
+ CFDataRef ivdata = b64encode(iv);
+ CFDictionaryAddValue(retval, kSecRecIV, ivdata);
+ CFReleaseNull(ivdata);
CFDictionaryAddValue(retval, kSecRecWrappedPassword, wrappedPassword);
}
- if(wrappedPassword) CFRelease(wrappedPassword);
- CFRelease(iv);
- CFRelease(wrapKey);
- CFRelease(theLocale);
- CFRelease(theLocaleString);
-
+ CFReleaseNull(wrappedPassword);
+ goto out;
+error:
+ CFReleaseNull(retval);
+out:
+ CFReleaseNull(iv);
+ CFReleaseNull(wrapKey);
+ CFReleaseNull(theLocale);
+
return retval;
}
* to generate a key.
*/
-CFStringRef
+CFStringRef CF_RETURNS_RETAINED
SecUnwrapRecoveryPasswordWithAnswers(CFDictionaryRef recref, CFArrayRef answers)
{
if(answers == NULL || CFArrayGetCount(answers) < 3) return NULL;
CFLocaleRef theLocale = CFLocaleCreate(kCFAllocatorDefault, theLocaleString);
SecKeyRef wrapKey = secDeriveKeyFromAnswers(answers, theLocale);
- CFRelease(theLocaleString);
CFRelease(theLocale);
CFDataRef iv = b64decode(tmpIV);
CFStringRef result = NULL;
CFErrorRef error = NULL;
CFDataRef encodedData = NULL;
- CFDataRef randData = getRandomBytes(16);
+ CFDataRef randData = createRandomBytes(16);
int i;
// base32FDE is a "private" base32 encoding, it has no 0/O or L/l/1 in it (it uses 8 and 9).
if(error == NULL) {
SecTransformSetAttribute(encodeTrans, kSecTransformInputAttributeName, randData, &error);
if(error == NULL) encodedData = SecTransformExecute(encodeTrans, &error);
- CFRelease(encodeTrans);
}
+ CFReleaseNull(encodeTrans);
CFRelease(randData);
if(encodedData != NULL && error == NULL) {
result = CFStringCreateCopy(kCFAllocatorDefault, encodedString);
CFRelease(encodedString);
CFRelease(b32string);
- CFRelease(encodedData);
} else {
secDebug(ASL_LEVEL_ERR, "Failed to base32 encode random data for recovery password\n", NULL);
}
+ CFReleaseNull(encodedData);
return result;
projects / apple / security.git / blobdiff